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

Commit 9ee6af9c authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5 



A seperate bus_type instance is not required for EXYNOS5. The
existing bus_type instance used with EXYNOS4 is sufficient for
both EXYNOS4 and EXYNOS5. This also solves issue of uninitialized
usage of exynos4_subsys in EXYNOS4 power management code that is
reused for EXYNOS5 also. In addition to that, the existing
exynos4_subsys bus_type is renamed to exynos_subsys to indicate
that it is reused on both EXYNOS4 and EXYNOS5 platforms.

Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 3a08f7f8

arch/arm/mach-exynos/common.c

+6 −21
Original line number Diff line number Diff line
@@ -565,30 +565,18 @@ void __init exynos5_init_irq(void) 
	s5p_init_irq(NULL, 0);

}



struct bus_type exynos4_subsys = {

	.name		= "exynos4-core",

	.dev_name	= "exynos4-core",

};



struct bus_type exynos5_subsys = {

	.name		= "exynos5-core",

	.dev_name	= "exynos5-core",

struct bus_type exynos_subsys = {

	.name		= "exynos-core",

	.dev_name	= "exynos-core",

};



static struct device exynos4_dev = {

	.bus	= &exynos4_subsys,

};



static struct device exynos5_dev = {

	.bus	= &exynos5_subsys,

	.bus	= &exynos_subsys,

};



static int __init exynos_core_init(void)

{

	if (soc_is_exynos5250())

		return subsys_system_register(&exynos5_subsys, NULL);

	else

		return subsys_system_register(&exynos4_subsys, NULL);

	return subsys_system_register(&exynos_subsys, NULL);

}

core_initcall(exynos_core_init);
@@ -675,9 +663,6 @@ static int __init exynos_init(void) 
{

	printk(KERN_INFO "EXYNOS: Initializing architecture\n");



	if (soc_is_exynos5250())

		return device_register(&exynos5_dev);

	else

	return device_register(&exynos4_dev);

}

arch/arm/mach-exynos/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static void exynos4_restore_pll(void) 


static struct subsys_interface exynos4_pm_interface = {

	.name		= "exynos4_pm",

	.subsys		= &exynos4_subsys,

	.subsys		= &exynos_subsys,

	.add_dev	= exynos4_pm_add,

};

arch/arm/plat-samsung/include/plat/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ extern struct bus_type s3c2443_subsys; 
extern struct bus_type s3c6410_subsys;

extern struct bus_type s5p64x0_subsys;

extern struct bus_type s5pv210_subsys;

extern struct bus_type exynos4_subsys;

extern struct bus_type exynos_subsys;



extern void (*s5pc1xx_idle)(void);