Commit 80b9abf9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'clean/late_initcall_v2' of... 

Merge branch 'clean/late_initcall_v2' of git://git.linaro.org/people/shawnguo/linux-2.6 into staging/cleanup

By Shawn Guo
via Shawn Guo
* 'clean/late_initcall_v2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: ux500: use machine specific hook for late init
  ARM: tegra: use machine specific hook for late init
  ARM: shmobile: use machine specific hook for late init
  ARM: sa1100: use machine specific hook for late init
  ARM: s3c64xx: use machine specific hook for late init
  ARM: prima2: use machine specific hook for late init
  ARM: pnx4008: use machine specific hook for late init
  ARM: omap2: use machine specific hook for late init
  ARM: omap1: use machine specific hook for late init
  ARM: msm: use machine specific hook for late init
  ARM: imx: use machine specific hook for late init
  ARM: exynos: use machine specific hook for late init
  ARM: ep93xx: use machine specific hook for late init
  ARM: davinci: use machine specific hook for late init
  ARM: provide a late_initcall hook for platform initialization
parents d48b97b4 a010bc2b

arch/arm/include/asm/mach/arch.h

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct machine_desc { 
	void			(*init_irq)(void);

	struct sys_timer	*timer;		/* system tick timer	*/

	void			(*init_machine)(void);

	void			(*init_late)(void);

#ifdef CONFIG_MULTI_IRQ_HANDLER

	void			(*handle_irq)(struct pt_regs *);

#endif

arch/arm/kernel/setup.c

+8 −0
Original line number Diff line number Diff line
@@ -800,6 +800,14 @@ static int __init customize_machine(void) 
}

arch_initcall(customize_machine);



static int __init init_machine_late(void)

{

	if (machine_desc->init_late)

		machine_desc->init_late();

	return 0;

}

late_initcall(init_machine_late);



#ifdef CONFIG_KEXEC

static inline unsigned long long get_total_mem(void)

{

arch/arm/mach-davinci/board-da830-evm.c

+1 −0
Original line number Diff line number Diff line
@@ -681,6 +681,7 @@ MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP-L137/AM17x EVM") 
	.init_irq	= cp_intc_init,

	.timer		= &davinci_timer,

	.init_machine	= da830_evm_init,

	.init_late	= davinci_init_late,

	.dma_zone_size	= SZ_128M,

	.restart	= da8xx_restart,

MACHINE_END

arch/arm/mach-davinci/board-da850-evm.c

+1 −0
Original line number Diff line number Diff line
@@ -1411,6 +1411,7 @@ MACHINE_START(DAVINCI_DA850_EVM, "DaVinci DA850/OMAP-L138/AM18x EVM") 
	.init_irq	= cp_intc_init,

	.timer		= &davinci_timer,

	.init_machine	= da850_evm_init,

	.init_late	= davinci_init_late,

	.dma_zone_size	= SZ_128M,

	.restart	= da8xx_restart,

MACHINE_END

arch/arm/mach-davinci/board-dm355-evm.c

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ MACHINE_START(DAVINCI_DM355_EVM, "DaVinci DM355 EVM") 
	.init_irq     = davinci_irq_init,

	.timer	      = &davinci_timer,

	.init_machine = dm355_evm_init,

	.init_late	= davinci_init_late,

	.dma_zone_size	= SZ_128M,

	.restart	= davinci_restart,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE