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

Commit 7fea1ba5 authored Apr 26, 2012 by Shawn Guo

ARM: sa1100: use machine specific hook for late init



Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

parent cc8f252b

arch/arm/mach-sa1100/assabet.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -538,6 +538,7 @@ MACHINE_START(ASSABET, "Intel-Assabet")
	.init_irq = sa1100_init_irq,		.init_irq = sa1100_init_irq,
	.timer = &sa1100_timer,		.timer = &sa1100_timer,
	.init_machine = assabet_init,		.init_machine = assabet_init,
			.init_late = sa11x0_init_late,
	#ifdef CONFIG_SA1111		#ifdef CONFIG_SA1111
	.dma_zone_size = SZ_1M,		.dma_zone_size = SZ_1M,
	#endif		#endif

arch/arm/mach-sa1100/badge4.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -305,6 +305,7 @@ MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
	.map_io = badge4_map_io,		.map_io = badge4_map_io,
	.nr_irqs = SA1100_NR_IRQS,		.nr_irqs = SA1100_NR_IRQS,
	.init_irq = sa1100_init_irq,		.init_irq = sa1100_init_irq,
			.init_late = sa11x0_init_late,
	.timer = &sa1100_timer,		.timer = &sa1100_timer,
	#ifdef CONFIG_SA1111		#ifdef CONFIG_SA1111
	.dma_zone_size = SZ_1M,		.dma_zone_size = SZ_1M,

arch/arm/mach-sa1100/cerf.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -134,5 +134,6 @@ MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
	.init_irq = cerf_init_irq,		.init_irq = cerf_init_irq,
	.timer = &sa1100_timer,		.timer = &sa1100_timer,
	.init_machine = cerf_init,		.init_machine = cerf_init,
			.init_late = sa11x0_init_late,
	.restart = sa11x0_restart,		.restart = sa11x0_restart,
	MACHINE_END		MACHINE_END

arch/arm/mach-sa1100/collie.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -401,5 +401,6 @@ MACHINE_START(COLLIE, "Sharp-Collie")
	.init_irq = sa1100_init_irq,		.init_irq = sa1100_init_irq,
	.timer = &sa1100_timer,		.timer = &sa1100_timer,
	.init_machine = collie_init,		.init_machine = collie_init,
			.init_late = sa11x0_init_late,
	.restart = sa11x0_restart,		.restart = sa11x0_restart,
	MACHINE_END		MACHINE_END

arch/arm/mach-sa1100/generic.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -359,6 +359,10 @@ static int __init sa1100_init(void)

	arch_initcall(sa1100_init);		arch_initcall(sa1100_init);

			void __init sa11x0_init_late(void)
			{
			sa11x0_pm_init();
			}

	/*		/*
	* Common I/O mapping:		* Common I/O mapping: