On Mon, Jan 28, 2019 at 6:21 PM Sasha Levin <sashal@xxxxxxxxxx> wrote:
>
> On Mon, Jan 28, 2019 at 05:41:55PM +0100, Arnd Bergmann wrote:
> >On Mon, Jan 28, 2019 at 4:52 PM Sasha Levin <sashal@xxxxxxxxxx> wrote:
> >>
> >> From: Arnd Bergmann <arnd@xxxxxxxx>
> >>
> >> [ Upstream commit 12d3a30db4a3b3df5fbadf5974b9cf50544a9950 ]
> >>
> >> The change to passing the timer frequency as a function argument
> >> was a good idea, but caused a build failure for one user that
> >> was missed in the update:
> >>
> >> arch/arm/mach-mmp/time.c: In function 'mmp_dt_init_timer':
> >> arch/arm/mach-mmp/time.c:242:2: error: implicit declaration of function 'timer_init'; did you mean 'hrtimer_init'? [-Werror=implicit-function-declaration]
> >>
> >> Change that as well to fix the build error, and rename the
> >> function to put it into a proper namespace and make it clearer
> >> what is actually going on.
> >>
> >> I saw that the high 6500000 HZ frequency was previously only
> >> set with CONFIG_MMP2, but is now also used with MMP (pxa910),
> >> so I'm changing that back here. Please make sure that the
> >> frequencies are all correct now.
> >>
> >> Fixes: f36797ee4380 ("ARM: mmp/mmp2: dt: enable the clock")
> >> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> >> Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
> >> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> >
> >I did not think that Lubumir's patch was meant for stable,
> >but as you've picked that one already we clearly
> >want mine as well, so this is good for all stable kernels.
>
> I can drop both if you'd prefer that (they're both in this series).
I'd say let's keep them, unless Lubomir prefers to have them dropped.
Arnd
