Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c633c531 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: msm: use machine specific hook for late init



Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 8321b758
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ static void __init halibut_map_io(void)
	msm_clock_init(msm_clocks_7x01a, msm_num_clocks_7x01a);
}

static void __init halibut_init_late(void)
{
	smd_debugfs_init();
}

MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")
	.atag_offset	= 0x100,
	.fixup		= halibut_fixup,
@@ -101,5 +106,6 @@ MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")
	.init_early	= halibut_init_early,
	.init_irq	= halibut_init_irq,
	.init_machine	= halibut_init,
	.init_late	= halibut_init_late,
	.timer		= &msm_timer,
MACHINE_END
+6 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ static void __init mahimahi_map_io(void)
	msm_clock_init();
}

static void __init mahimahi_init_late(void)
{
	smd_debugfs_init();
}

extern struct sys_timer msm_timer;

MACHINE_START(MAHIMAHI, "mahimahi")
@@ -79,5 +84,6 @@ MACHINE_START(MAHIMAHI, "mahimahi")
	.map_io		= mahimahi_map_io,
	.init_irq	= msm_init_irq,
	.init_machine	= mahimahi_init,
	.init_late	= mahimahi_init_late,
	.timer		= &msm_timer,
MACHINE_END
+9 −0
Original line number Diff line number Diff line
@@ -128,11 +128,17 @@ static void __init msm7x2x_map_io(void)
#endif
}

static void __init msm7x2x_init_late(void)
{
	smd_debugfs_init();
}

MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF")
	.atag_offset	= 0x100,
	.map_io		= msm7x2x_map_io,
	.init_irq	= msm7x2x_init_irq,
	.init_machine	= msm7x2x_init,
	.init_late	= msm7x2x_init_late,
	.timer		= &msm_timer,
MACHINE_END

@@ -141,6 +147,7 @@ MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA")
	.map_io		= msm7x2x_map_io,
	.init_irq	= msm7x2x_init_irq,
	.init_machine	= msm7x2x_init,
	.init_late	= msm7x2x_init_late,
	.timer		= &msm_timer,
MACHINE_END

@@ -149,6 +156,7 @@ MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF")
	.map_io		= msm7x2x_map_io,
	.init_irq	= msm7x2x_init_irq,
	.init_machine	= msm7x2x_init,
	.init_late	= msm7x2x_init_late,
	.timer		= &msm_timer,
MACHINE_END

@@ -157,5 +165,6 @@ MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA")
	.map_io		= msm7x2x_map_io,
	.init_irq	= msm7x2x_init_irq,
	.init_machine	= msm7x2x_init,
	.init_late	= msm7x2x_init_late,
	.timer		= &msm_timer,
MACHINE_END
+8 −0
Original line number Diff line number Diff line
@@ -120,6 +120,11 @@ static void __init msm7x30_map_io(void)
	msm_clock_init(msm_clocks_7x30, msm_num_clocks_7x30);
}

static void __init msm7x30_init_late(void)
{
	smd_debugfs_init();
}

MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")
	.atag_offset = 0x100,
	.fixup = msm7x30_fixup,
@@ -127,6 +132,7 @@ MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")
	.map_io = msm7x30_map_io,
	.init_irq = msm7x30_init_irq,
	.init_machine = msm7x30_init,
	.init_late = msm7x30_init_late,
	.timer = &msm_timer,
MACHINE_END

@@ -137,6 +143,7 @@ MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")
	.map_io = msm7x30_map_io,
	.init_irq = msm7x30_init_irq,
	.init_machine = msm7x30_init,
	.init_late = msm7x30_init_late,
	.timer = &msm_timer,
MACHINE_END

@@ -147,5 +154,6 @@ MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")
	.map_io = msm7x30_map_io,
	.init_irq = msm7x30_init_irq,
	.init_machine = msm7x30_init,
	.init_late = msm7x30_init_late,
	.timer = &msm_timer,
MACHINE_END
+7 −0
Original line number Diff line number Diff line
@@ -93,6 +93,11 @@ static void __init msm8960_rumi3_init(void)
	platform_add_devices(rumi3_devices, ARRAY_SIZE(rumi3_devices));
}

static void __init msm8960_init_late(void)
{
	smd_debugfs_init();
}

MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR")
	.fixup = msm8960_fixup,
	.reserve = msm8960_reserve,
@@ -101,6 +106,7 @@ MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR")
	.timer = &msm_timer,
	.handle_irq = gic_handle_irq,
	.init_machine = msm8960_sim_init,
	.init_late = msm8960_init_late,
MACHINE_END

MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3")
@@ -111,5 +117,6 @@ MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3")
	.timer = &msm_timer,
	.handle_irq = gic_handle_irq,
	.init_machine = msm8960_rumi3_init,
	.init_late = msm8960_init_late,
MACHINE_END
Loading