diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-12-10 21:43:01 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-12 22:54:40 +0100 |
| commit | 12d3a30db4a3b3df5fbadf5974b9cf50544a9950 (patch) | |
| tree | de50529bcac83ed37a40f24b247ff1c31b6cb963 /arch/arm/mach-mmp/pxa168.c | |
| parent | Merge tag 'imx-soc-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff) | |
| download | linux-12d3a30db4a3b3df5fbadf5974b9cf50544a9950.tar.xz linux-12d3a30db4a3b3df5fbadf5974b9cf50544a9950.zip | |
ARM: mmp: fix timer_init calls
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@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mmp/pxa168.c')
| -rw-r--r-- | arch/arm/mach-mmp/pxa168.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c index 77a358165a56..cdcf65ace3f9 100644 --- a/arch/arm/mach-mmp/pxa168.c +++ b/arch/arm/mach-mmp/pxa168.c @@ -79,7 +79,7 @@ void __init pxa168_timer_init(void) /* 3.25MHz, bus/functional clock enabled, release reset */ __raw_writel(TIMER_CLK_RST, APBC_TIMERS); - timer_init(IRQ_PXA168_TIMER1, 6500000); + mmp_timer_init(IRQ_PXA168_TIMER1, 3250000); } void pxa168_clear_keypad_wakeup(void) |