Commit e8ecbc7c authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth
Browse files

ARM: exynos: remove custom .init_time hook 



With arch/arm calling of_clk_init(NULL) from time_init(), we can now
remove custom .init_time hooks. While at it, also remove some now
redundant includes.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
parent 51e40f52

arch/arm/mach-exynos/common.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -26,8 +26,6 @@ 
#include <linux/export.h>

#include <linux/export.h>

#include <linux/irqdomain.h>

#include <linux/irqdomain.h>

#include <linux/of_address.h>

#include <linux/of_address.h>

#include <linux/clocksource.h>

#include <linux/clk-provider.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/irqchip/chained_irq.h>
@@ -367,12 +365,6 @@ static void __init exynos5_map_io(void) 
		iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));

		iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));

}

}





void __init exynos_init_time(void)

{

	of_clk_init(NULL);

	clocksource_of_init();

}



struct bus_type exynos_subsys = {

struct bus_type exynos_subsys = {

	.name		= "exynos-core",

	.name		= "exynos-core",

	.dev_name	= "exynos-core",

	.dev_name	= "exynos-core",

arch/arm/mach-exynos/common.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/of.h>

#include <linux/of.h>





void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1);

void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1);

void exynos_init_time(void);





struct map_desc;

struct map_desc;

void exynos_init_io(void);

void exynos_init_io(void);

arch/arm/mach-exynos/mach-exynos4-dt.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/of_fdt.h>

#include <linux/of_fdt.h>

#include <linux/serial_core.h>

#include <linux/serial_core.h>

#include <linux/memblock.h>

#include <linux/memblock.h>

#include <linux/clocksource.h>





#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <plat/mfc.h>

#include <plat/mfc.h>
@@ -54,7 +53,6 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") 
	.init_early	= exynos_firmware_init,

	.init_early	= exynos_firmware_init,

	.init_machine	= exynos4_dt_machine_init,

	.init_machine	= exynos4_dt_machine_init,

	.init_late	= exynos_init_late,

	.init_late	= exynos_init_late,

	.init_time	= exynos_init_time,

	.dt_compat	= exynos4_dt_compat,

	.dt_compat	= exynos4_dt_compat,

	.restart        = exynos4_restart,

	.restart        = exynos4_restart,

	.reserve	= exynos4_reserve,

	.reserve	= exynos4_reserve,

arch/arm/mach-exynos/mach-exynos5-dt.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/of_fdt.h>

#include <linux/of_fdt.h>

#include <linux/memblock.h>

#include <linux/memblock.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/clocksource.h>





#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <mach/regs-pmu.h>

#include <mach/regs-pmu.h>
@@ -76,7 +75,6 @@ DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") 
	.map_io		= exynos_init_io,

	.map_io		= exynos_init_io,

	.init_machine	= exynos5_dt_machine_init,

	.init_machine	= exynos5_dt_machine_init,

	.init_late	= exynos_init_late,

	.init_late	= exynos_init_late,

	.init_time	= exynos_init_time,

	.dt_compat	= exynos5_dt_compat,

	.dt_compat	= exynos5_dt_compat,

	.restart        = exynos5_restart,

	.restart        = exynos5_restart,

	.reserve	= exynos5_reserve,

	.reserve	= exynos5_reserve,

CRA Git | Maintained and supported by SUSTech CRA and CCSE