diff options
author | Magnus Damm <damm@opensource.se> | 2013-11-08 05:09:34 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-04 01:11:17 -0500 |
commit | 81fd1b68796aadae70751ba8805b34b20df09e1b (patch) | |
tree | d88eaf7d6bbb2de700d5f5d13f60097e16f1c8e5 /arch/arm | |
parent | 6c334d232ab446cc6388430a019fc1072599b718 (diff) |
ARM: shmobile: Select USE_OF on EMEV2
Now when the legacy KZM9D board code is gone, make sure
USE_OF is selected in case of the EMEV2 SoC.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-emev2.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 564e0ade3472..180b71fd86f8 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -108,6 +108,7 @@ config ARCH_EMEV2 | |||
108 | select ARCH_WANT_OPTIONAL_GPIOLIB | 108 | select ARCH_WANT_OPTIONAL_GPIOLIB |
109 | select ARM_GIC | 109 | select ARM_GIC |
110 | select CPU_V7 | 110 | select CPU_V7 |
111 | select USE_OF | ||
111 | 112 | ||
112 | config ARCH_R7S72100 | 113 | config ARCH_R7S72100 |
113 | bool "RZ/A1H (R7S72100)" | 114 | bool "RZ/A1H (R7S72100)" |
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c index e7031b071274..c8f2a1a69a52 100644 --- a/arch/arm/mach-shmobile/setup-emev2.c +++ b/arch/arm/mach-shmobile/setup-emev2.c | |||
@@ -48,8 +48,6 @@ void __init emev2_init_delay(void) | |||
48 | shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */ | 48 | shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */ |
49 | } | 49 | } |
50 | 50 | ||
51 | #ifdef CONFIG_USE_OF | ||
52 | |||
53 | static void __init emev2_add_standard_devices_dt(void) | 51 | static void __init emev2_add_standard_devices_dt(void) |
54 | { | 52 | { |
55 | #ifdef CONFIG_COMMON_CLK | 53 | #ifdef CONFIG_COMMON_CLK |
@@ -73,5 +71,3 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)") | |||
73 | .init_late = shmobile_init_late, | 71 | .init_late = shmobile_init_late, |
74 | .dt_compat = emev2_boards_compat_dt, | 72 | .dt_compat = emev2_boards_compat_dt, |
75 | MACHINE_END | 73 | MACHINE_END |
76 | |||
77 | #endif /* CONFIG_USE_OF */ | ||