diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-27 14:26:06 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-27 14:26:06 +0200 |
| commit | 4022acdb5b2b65ad2fe078be39bda9c5377c4e04 (patch) | |
| tree | 9afc2b61b309e61e2e136f0b881acd73e4372c9b /arch/arm/mach-shmobile/board-ape6evm.c | |
| parent | Merge branch 'sti/soc' into next/late (diff) | |
| parent | ARM: shmobile: BOCK-W: change Ether device name (diff) | |
| download | linux-4022acdb5b2b65ad2fe078be39bda9c5377c4e04.tar.xz linux-4022acdb5b2b65ad2fe078be39bda9c5377c4e04.zip | |
Merge branch 'renesas/boards2' into next/late
Conflicts:
arch/arm/mach-shmobile/setup-r8a7778.c
This is a dependency for the Renesas sh-sci updates.
Signedf-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-shmobile/board-ape6evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ape6evm.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c index 55b8c9fef954..5eb0caa6a7d0 100644 --- a/arch/arm/mach-shmobile/board-ape6evm.c +++ b/arch/arm/mach-shmobile/board-ape6evm.c @@ -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(); |