summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/da850.c
diff options
context:
space:
mode:
authorDavid Lechner <david@lechnology.com>2016-04-14 21:13:35 +0200
committerSekhar Nori <nsekhar@ti.com>2016-04-27 12:33:49 +0200
commit6fc9ebbdeb75197df780c52f5ebcc3eeffb9cd91 (patch)
tree38703cfb86206cc00acef60a545f8cbc3ac1e676 /arch/arm/mach-davinci/da850.c
parentARM: davinci: clk: add set_parent callback for mux clocks (diff)
downloadlinux-6fc9ebbdeb75197df780c52f5ebcc3eeffb9cd91.tar.xz
linux-6fc9ebbdeb75197df780c52f5ebcc3eeffb9cd91.zip
ARM: davinci: Move clock init after ioremap.
Some clocks (such as the USB PHY clocks in DA8xx) will need to use iomem. The davinci_common_init() function must be called before the ioremap, so the clock init is now split out as separate function. Signed-off-by: David Lechner <david@lechnology.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/da850.c')
-rw-r--r--arch/arm/mach-davinci/da850.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 97d8779a9a65..1f85bbca2e55 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1346,4 +1346,6 @@ void __init da850_init(void)
v = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG));
v &= ~CFGCHIP3_PLL1_MASTER_LOCK;
__raw_writel(v, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP3_REG));
+
+ davinci_clk_init(davinci_soc_info_da850.cpu_clks);
}