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

Commit 559ba237 authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

ARM: EXYNOS: Remove PM initcalls and useless indirection 



This patch simplifies Exynos PM initialization and makes it
multiplatform friendly by replacing initcalls used originally to invoke
all the initialization code with explicit function calls.

In addition, an useless subsys_interface is removed, as all its .add_dev
callback did was setting two function pointers.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent dbc5ca16

arch/arm/mach-exynos/common.c

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ void __init exynos_init_late(void) 
		return;



	pm_genpd_poweroff_unused();

	exynos_pm_init();

}



static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname,

arch/arm/mach-exynos/common.h

+6 −0
Original line number Diff line number Diff line
@@ -27,6 +27,12 @@ void exynos_init_late(void); 


void exynos_firmware_init(void);



#ifdef CONFIG_PM_SLEEP

extern void __init exynos_pm_init(void);

#else

static inline void exynos_pm_init(void) {}

#endif



extern struct smp_operations exynos_smp_ops;



extern void exynos_cpu_die(unsigned int cpu);

arch/arm/mach-exynos/pm.c

+12 −38
Original line number Diff line number Diff line
@@ -92,39 +92,6 @@ static void exynos_pm_prepare(void) 
	__raw_writel(virt_to_phys(s3c_cpu_resume), S5P_INFORM0);

}



static int exynos_pm_add(struct device *dev, struct subsys_interface *sif)

{

	pm_cpu_prep = exynos_pm_prepare;

	pm_cpu_sleep = exynos_cpu_suspend;



	return 0;

}



static struct subsys_interface exynos_pm_interface = {

	.name		= "exynos_pm",

	.subsys		= &exynos_subsys,

	.add_dev	= exynos_pm_add,

};



static __init int exynos_pm_drvinit(void)

{

	unsigned int tmp;



	if (soc_is_exynos5440())

		return 0;



	s3c_pm_init();



	/* All wakeup disable */



	tmp = __raw_readl(S5P_WAKEUP_MASK);

	tmp |= ((0xFF << 8) | (0x1F << 1));

	__raw_writel(tmp, S5P_WAKEUP_MASK);



	return subsys_interface_register(&exynos_pm_interface);

}

arch_initcall(exynos_pm_drvinit);



static int exynos_pm_suspend(void)

{

	unsigned long tmp;
@@ -220,12 +187,19 @@ static struct syscore_ops exynos_pm_syscore_ops = { 
	.resume		= exynos_pm_resume,

};



static __init int exynos_pm_syscore_init(void)

void __init exynos_pm_init(void)

{

	if (soc_is_exynos5440())

		return 0;

	u32 tmp;



	pm_cpu_prep = exynos_pm_prepare;

	pm_cpu_sleep = exynos_cpu_suspend;



	s3c_pm_init();



	/* All wakeup disable */

	tmp = __raw_readl(S5P_WAKEUP_MASK);

	tmp |= ((0xFF << 8) | (0x1F << 1));

	__raw_writel(tmp, S5P_WAKEUP_MASK);



	register_syscore_ops(&exynos_pm_syscore_ops);

	return 0;

}
 
arch_initcall(exynos_pm_syscore_init);