ARM: pnx4008: use machine specific hook for late init (cafa6190) · Commits · e / devices / android_kernel_samsung_universal8890

arch/arm/mach-pnx4008/core.c

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -265,6 +265,17 @@ static void pnx4008_restart(char mode, const char *cmd)
	soft_restart(0);		soft_restart(0);
	}		}

			#ifdef CONFIG_PM
			extern int pnx4008_pm_init(void);
			#else
			static inline int pnx4008_pm_init(void) { return 0; }
			#endif

			void __init pnx4008_init_late(void)
			{
			pnx4008_pm_init();
			}

	extern struct sys_timer pnx4008_timer;		extern struct sys_timer pnx4008_timer;

	MACHINE_START(PNX4008, "Philips PNX4008")		MACHINE_START(PNX4008, "Philips PNX4008")
	@@ -273,6 +284,7 @@ MACHINE_START(PNX4008, "Philips PNX4008")
	.map_io = pnx4008_map_io,		.map_io = pnx4008_map_io,
	.init_irq = pnx4008_init_irq,		.init_irq = pnx4008_init_irq,
	.init_machine = pnx4008_init,		.init_machine = pnx4008_init,
			.init_late = pnx4008_init_late,
	.timer = &pnx4008_timer,		.timer = &pnx4008_timer,
	.restart = pnx4008_restart,		.restart = pnx4008_restart,
	MACHINE_END		MACHINE_END

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -124,7 +124,7 @@ static const struct platform_suspend_ops pnx4008_pm_ops = {
	.valid = pnx4008_pm_valid,		.valid = pnx4008_pm_valid,
	};		};

	static int __init pnx4008_pm_init(void)		int __init pnx4008_pm_init(void)
	{		{
	u32 sram_size_to_allocate;		u32 sram_size_to_allocate;

	@@ -151,5 +151,3 @@ static int __init pnx4008_pm_init(void)
	suspend_set_ops(&pnx4008_pm_ops);		suspend_set_ops(&pnx4008_pm_ops);
	return 0;		return 0;
	}		}

	late_initcall(pnx4008_pm_init);