| Message ID | 1434533661-22730-2-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 20834a406ee20b57c796f9911f06600b71c75788 |
| Delegated to: | Simon Horman |
| Headers | show |
On Wed, Jun 17, 2015 at 11:34:21AM +0200, Geert Uytterhoeven wrote: > 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> Thanks, I have queued this up. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c index 0edf2a6d2bbef7f7..f1d027aa7a81ac33 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);
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> --- arch/arm/mach-shmobile/timer.c | 12 ------------ 1 file changed, 12 deletions(-)