diff options
-rw-r--r-- | arch/arm/mach-exynos/common.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-exynos/common.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos4-dt.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 2 |
4 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index ba95e5db2501..a4e7ba828810 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
@@ -26,8 +26,6 @@ | |||
26 | #include <linux/export.h> | 26 | #include <linux/export.h> |
27 | #include <linux/irqdomain.h> | 27 | #include <linux/irqdomain.h> |
28 | #include <linux/of_address.h> | 28 | #include <linux/of_address.h> |
29 | #include <linux/clocksource.h> | ||
30 | #include <linux/clk-provider.h> | ||
31 | #include <linux/irqchip/arm-gic.h> | 29 | #include <linux/irqchip/arm-gic.h> |
32 | #include <linux/irqchip/chained_irq.h> | 30 | #include <linux/irqchip/chained_irq.h> |
33 | 31 | ||
@@ -367,12 +365,6 @@ static void __init exynos5_map_io(void) | |||
367 | iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc)); | 365 | iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc)); |
368 | } | 366 | } |
369 | 367 | ||
370 | void __init exynos_init_time(void) | ||
371 | { | ||
372 | of_clk_init(NULL); | ||
373 | clocksource_of_init(); | ||
374 | } | ||
375 | |||
376 | struct bus_type exynos_subsys = { | 368 | struct bus_type exynos_subsys = { |
377 | .name = "exynos-core", | 369 | .name = "exynos-core", |
378 | .dev_name = "exynos-core", | 370 | .dev_name = "exynos-core", |
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index 8646a141ae46..f0fa2050d08d 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/of.h> | 16 | #include <linux/of.h> |
17 | 17 | ||
18 | void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1); | 18 | void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1); |
19 | void exynos_init_time(void); | ||
20 | 19 | ||
21 | struct map_desc; | 20 | struct map_desc; |
22 | void exynos_init_io(void); | 21 | void exynos_init_io(void); |
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c index 0099c6c13bba..6858d73dcf48 100644 --- a/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/arch/arm/mach-exynos/mach-exynos4-dt.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <linux/of_fdt.h> | 16 | #include <linux/of_fdt.h> |
17 | #include <linux/serial_core.h> | 17 | #include <linux/serial_core.h> |
18 | #include <linux/memblock.h> | 18 | #include <linux/memblock.h> |
19 | #include <linux/clocksource.h> | ||
20 | 19 | ||
21 | #include <asm/mach/arch.h> | 20 | #include <asm/mach/arch.h> |
22 | #include <plat/mfc.h> | 21 | #include <plat/mfc.h> |
@@ -54,7 +53,6 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") | |||
54 | .init_early = exynos_firmware_init, | 53 | .init_early = exynos_firmware_init, |
55 | .init_machine = exynos4_dt_machine_init, | 54 | .init_machine = exynos4_dt_machine_init, |
56 | .init_late = exynos_init_late, | 55 | .init_late = exynos_init_late, |
57 | .init_time = exynos_init_time, | ||
58 | .dt_compat = exynos4_dt_compat, | 56 | .dt_compat = exynos4_dt_compat, |
59 | .restart = exynos4_restart, | 57 | .restart = exynos4_restart, |
60 | .reserve = exynos4_reserve, | 58 | .reserve = exynos4_reserve, |
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index f874b773ca13..bac21054cec8 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/of_fdt.h> | 13 | #include <linux/of_fdt.h> |
14 | #include <linux/memblock.h> | 14 | #include <linux/memblock.h> |
15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
16 | #include <linux/clocksource.h> | ||
17 | 16 | ||
18 | #include <asm/mach/arch.h> | 17 | #include <asm/mach/arch.h> |
19 | #include <mach/regs-pmu.h> | 18 | #include <mach/regs-pmu.h> |
@@ -76,7 +75,6 @@ DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") | |||
76 | .map_io = exynos_init_io, | 75 | .map_io = exynos_init_io, |
77 | .init_machine = exynos5_dt_machine_init, | 76 | .init_machine = exynos5_dt_machine_init, |
78 | .init_late = exynos_init_late, | 77 | .init_late = exynos_init_late, |
79 | .init_time = exynos_init_time, | ||
80 | .dt_compat = exynos5_dt_compat, | 78 | .dt_compat = exynos5_dt_compat, |
81 | .restart = exynos5_restart, | 79 | .restart = exynos5_restart, |
82 | .reserve = exynos5_reserve, | 80 | .reserve = exynos5_reserve, |