These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / mach-shmobile / timer.c

diff --git a/kernel/arch/arm/mach-shmobile/timer.c b/kernel/arch/arm/mach-shmobile/timer.c
index 0edf2a6..c17d4d3 100644 (file)
--- a/kernel/arch/arm/mach-shmobile/timer.c
+++ b/kernel/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);
@@ -89,24 +77,3 @@ void __init shmobile_init_delay(void)
                        shmobile_setup_delay_hz(max_freq, 2, 4);
        }
 }
-
-static void __init shmobile_late_time_init(void)
-{
-       /*
-        * Make sure all compiled-in early timers register themselves.
-        *
-        * Run probe() for two "earlytimer" devices, these will be the
-        * clockevents and clocksource devices respectively. In the event
-        * that only a clockevents device is available, we -ENODEV on the
-        * clocksource and the jiffies clocksource is used transparently
-        * instead. No error handling is necessary here.
-        */
-       early_platform_driver_register_all("earlytimer");
-       early_platform_driver_probe("earlytimer", 2, 0);
-}
-
-void __init shmobile_earlytimer_init(void)
-{
-       late_time_init = shmobile_late_time_init;
-}
-