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

Commit 6eb84669 authored by Sachin Kamat's avatar Sachin Kamat Committed by Kukjin Kim
Browse files

ARM: EXYNOS: Consolidate CPU init code 



cpu_table was used to distinguish between different Exynos4 and 5
SoCs and based on the type do the initialization and io mapping.
exynos_init is dummy and no longer needed as we do a DT based booting.
By having a common io mapping function we can get rid of the whole
table and avoid populating it for every SoC.

Tested on Exynos4210, 5250 and 5420 based boards.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Tested-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 58553078

arch/arm/mach-exynos/common.c

+23 −85
Original line number Diff line number Diff line
@@ -48,56 +48,6 @@ 
#define L2_AUX_VAL 0x7C470001

#define L2_AUX_MASK 0xC200ffff



static const char name_exynos4210[] = "EXYNOS4210";

static const char name_exynos4212[] = "EXYNOS4212";

static const char name_exynos4412[] = "EXYNOS4412";

static const char name_exynos5250[] = "EXYNOS5250";

static const char name_exynos5420[] = "EXYNOS5420";

static const char name_exynos5440[] = "EXYNOS5440";



static void exynos4_map_io(void);

static void exynos5_map_io(void);

static int exynos_init(void);



static struct cpu_table cpu_ids[] __initdata = {

	{

		.idcode		= EXYNOS4210_CPU_ID,

		.idmask		= EXYNOS4_CPU_MASK,

		.map_io		= exynos4_map_io,

		.init		= exynos_init,

		.name		= name_exynos4210,

	}, {

		.idcode		= EXYNOS4212_CPU_ID,

		.idmask		= EXYNOS4_CPU_MASK,

		.map_io		= exynos4_map_io,

		.init		= exynos_init,

		.name		= name_exynos4212,

	}, {

		.idcode		= EXYNOS4412_CPU_ID,

		.idmask		= EXYNOS4_CPU_MASK,

		.map_io		= exynos4_map_io,

		.init		= exynos_init,

		.name		= name_exynos4412,

	}, {

		.idcode		= EXYNOS5250_SOC_ID,

		.idmask		= EXYNOS5_SOC_MASK,

		.map_io		= exynos5_map_io,

		.init		= exynos_init,

		.name		= name_exynos5250,

	}, {

		.idcode		= EXYNOS5420_SOC_ID,

		.idmask		= EXYNOS5_SOC_MASK,

		.map_io		= exynos5_map_io,

		.init		= exynos_init,

		.name		= name_exynos5420,

	}, {

		.idcode		= EXYNOS5440_SOC_ID,

		.idmask		= EXYNOS5_SOC_MASK,

		.init		= exynos_init,

		.name		= name_exynos5440,

	},

};



/* Initial IO mappings */



static struct map_desc exynos4_iodesc[] __initdata = {
@@ -345,40 +295,39 @@ static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname, 
 *

 * register the standard cpu IO areas

 */



void __init exynos_init_io(void)

{

	debug_ll_io_init();



	of_scan_flat_dt(exynos_fdt_map_chipid, NULL);



	/* detect cpu id and rev. */

	s5p_init_cpu(S5P_VA_CHIPID);



	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));

}



static void __init exynos4_map_io(void)

static void __init exynos_map_io(void)

{

	if (soc_is_exynos4210() || soc_is_exynos4212() || soc_is_exynos4412())

		iotable_init(exynos4_iodesc, ARRAY_SIZE(exynos4_iodesc));



	if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_0)

		iotable_init(exynos4_iodesc0, ARRAY_SIZE(exynos4_iodesc0));

	else

		iotable_init(exynos4_iodesc1, ARRAY_SIZE(exynos4_iodesc1));

	if (soc_is_exynos5250() || soc_is_exynos5420())

		iotable_init(exynos5_iodesc, ARRAY_SIZE(exynos5_iodesc));



	if (soc_is_exynos4210())

	if (soc_is_exynos4210()) {

		if (samsung_rev() == EXYNOS4210_REV_0)

			iotable_init(exynos4_iodesc0,

						ARRAY_SIZE(exynos4_iodesc0));

		else

			iotable_init(exynos4_iodesc1,

						ARRAY_SIZE(exynos4_iodesc1));

		iotable_init(exynos4210_iodesc, ARRAY_SIZE(exynos4210_iodesc));

	}

	if (soc_is_exynos4212() || soc_is_exynos4412())

		iotable_init(exynos4x12_iodesc, ARRAY_SIZE(exynos4x12_iodesc));

	if (soc_is_exynos5250())

		iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));

}



static void __init exynos5_map_io(void)

void __init exynos_init_io(void)

{

	iotable_init(exynos5_iodesc, ARRAY_SIZE(exynos5_iodesc));

	debug_ll_io_init();



	if (soc_is_exynos5250())

		iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));

	of_scan_flat_dt(exynos_fdt_map_chipid, NULL);



	/* detect cpu id and rev. */

	s5p_init_cpu(S5P_VA_CHIPID);



	exynos_map_io();

}



struct bus_type exynos_subsys = {
@@ -386,10 +335,6 @@ struct bus_type exynos_subsys = { 
	.dev_name	= "exynos-core",

};



static struct device exynos4_dev = {

	.bus	= &exynos_subsys,

};



static int __init exynos_core_init(void)

{

	return subsys_system_register(&exynos_subsys, NULL);
@@ -409,10 +354,3 @@ static int __init exynos4_l2x0_cache_init(void) 
	return 0;

}

early_initcall(exynos4_l2x0_cache_init);
 


static int __init exynos_init(void)

{

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



	return device_register(&exynos4_dev);

}