diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2015-06-17 11:34:21 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-07-06 09:29:46 +0900 |
| commit | 20834a406ee20b57c796f9911f06600b71c75788 (patch) | |
| tree | 9497f3f5a5adb91848252f279f0fa6c78771ceb5 | |
| parent | d62ba10c31ac16aaa16f5b49308658ea2f1e71a9 (diff) | |
| download | linux-20834a406ee20b57c796f9911f06600b71c75788.tar.bz2 | |
ARM: shmobile: timer: r8a73a4 and r8a7790 are multi-platform only
Since commits e042681894b62d60 ("ARM: shmobile: r8a7790: Remove legacy
code") and 9d07d414d4c33d86 ("ARM: shmobile: r8a73a4: ape6evm: Remove
legacy platform"), the R-Mobile APE6 and R-Car H2 SoCs are supported by
multiplatform kernels only.
Hence we can drop checks for these SoCs in legacy kernel builds.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/arm/mach-shmobile/timer.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c index 0edf2a6d2bbe..f1d027aa7a81 100644 --- a/arch/arm/mach-shmobile/timer.c +++ b/arch/arm/mach-shmobile/timer.c @@ -70,18 +70,6 @@ void __init shmobile_init_delay(void) if (!max_freq) return; -#ifdef CONFIG_ARCH_SHMOBILE_LEGACY - /* Non-multiplatform r8a73a4 SoC cannot use arch timer due - * to GIC being initialized from C and arch timer via DT */ - if (of_machine_is_compatible("renesas,r8a73a4")) - has_arch_timer = false; - - /* Non-multiplatform r8a7790 SoC cannot use arch timer due - * to GIC being initialized from C and arch timer via DT */ - if (of_machine_is_compatible("renesas,r8a7790")) - has_arch_timer = false; -#endif - if (!has_arch_timer || !IS_ENABLED(CONFIG_ARM_ARCH_TIMER)) { if (is_a7_a8_a9) shmobile_setup_delay_hz(max_freq, 1, 3); |