ARM: EXYNOS: Remove legacy timer initialization code
authorTomasz Figa <t.figa@samsung.com>
Sat, 15 Jun 2013 00:04:58 +0000 (09:04 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 15 Jun 2013 00:33:13 +0000 (09:33 +0900)
This patch removes legacy timer initialization code that was used to
set up system timers when booting with ATAGS, which is not supported
on Exynos any more.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/mach-exynos/common.c

index 9626ce4f1346bd9ecbe1c887839f02bd16e4e5b8..b1d0afa3c723ab302c2b384611a64c5a60528569 100644 (file)
@@ -299,13 +299,6 @@ static struct map_desc exynos5440_iodesc0[] __initdata = {
        },
 };
 
-static struct samsung_pwm_variant exynos4_pwm_variant = {
-       .bits           = 32,
-       .div_base       = 0,
-       .has_tint_cstat = true,
-       .tclk_mask      = 0,
-};
-
 void exynos4_restart(char mode, const char *cmd)
 {
        __raw_writel(0x1, S5P_SWRESET);
@@ -451,38 +444,10 @@ static void __init exynos5440_map_io(void)
        iotable_init(exynos5440_iodesc0, ARRAY_SIZE(exynos5440_iodesc0));
 }
 
-void __init exynos_set_timer_source(u8 channels)
-{
-       exynos4_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
-       exynos4_pwm_variant.output_mask &= ~channels;
-}
-
 void __init exynos_init_time(void)
 {
-       unsigned int timer_irqs[SAMSUNG_PWM_NUM] = {
-               EXYNOS4_IRQ_TIMER0_VIC, EXYNOS4_IRQ_TIMER1_VIC,
-               EXYNOS4_IRQ_TIMER2_VIC, EXYNOS4_IRQ_TIMER3_VIC,
-               EXYNOS4_IRQ_TIMER4_VIC,
-       };
-
-       if (of_have_populated_dt()) {
-               of_clk_init(NULL);
-               clocksource_of_init();
-       } else {
-               /* todo: remove after migrating legacy E4 platforms to dt */
-#ifdef CONFIG_ARCH_EXYNOS4
-               exynos4_clk_init(NULL, !soc_is_exynos4210(), S5P_VA_CMU, readl(S5P_VA_CHIPID + 8) & 1);
-               exynos4_clk_register_fixed_ext(xxti_f, xusbxti_f);
-#endif
-#ifdef CONFIG_CLKSRC_SAMSUNG_PWM
-               if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_0)
-                       samsung_pwm_clocksource_init(S3C_VA_TIMER,
-                                       timer_irqs, &exynos4_pwm_variant);
-               else
-#endif
-                       mct_init(S5P_VA_SYSTIMER, EXYNOS4_IRQ_MCT_G0,
-                                       EXYNOS4_IRQ_MCT_L0, EXYNOS4_IRQ_MCT_L1);
-       }
+       of_clk_init(NULL);
+       clocksource_of_init();
 }
 
 void __init exynos4_init_irq(void)