]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: shmobile: ape6evm: MP clock parent become EXTAL2
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 5 Apr 2013 04:24:27 +0000 (21:24 -0700)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 7 Jun 2013 05:26:30 +0000 (14:26 +0900)
The orignal commit 3263e09d287fbaa8a9424b5e69396599a3bbd518
(ARM: shmobile: Initial r8a73a4 SoC support V3)
put MP clock parent as EXTAL2, but its code was removed
on DIV6 clock support commit.
This patch makes it consistent.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/board-ape6evm.c

index 55b8c9fef954026c5d53c08e9febff8a6166ddf2..5eb0caa6a7d09847cfa984daf66bf71d0ec2e2b8 100644 (file)
@@ -26,6 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
+#include <linux/sh_clk.h>
 #include <linux/smsc911x.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
@@ -65,7 +66,21 @@ static const struct pinctrl_map ape6evm_pinctrl_map[] = {
 
 static void __init ape6evm_add_standard_devices(void)
 {
+
+       struct clk *parent;
+       struct clk *mp;
+
        r8a73a4_clock_init();
+
+       /* MP clock parent = extal2 */
+       parent      = clk_get(NULL, "extal2");
+       mp          = clk_get(NULL, "mp");
+       BUG_ON(IS_ERR(parent) || IS_ERR(mp));
+
+       clk_set_parent(mp, parent);
+       clk_put(parent);
+       clk_put(mp);
+
        pinctrl_register_mappings(ape6evm_pinctrl_map,
                                  ARRAY_SIZE(ape6evm_pinctrl_map));
        r8a73a4_pinmux_init();