Commit 0e2238ec authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kukjin Kim
Browse files

ARM: EXYNOS: Use exynos_init_io() as map_io callback 



Since there is no board specific mapping needed on Exynos,
exynos_init_io() can be simplified and used as map_io callback for both
Exynos4 and Exynos5.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 1a522f28

arch/arm/mach-exynos/common.c

+1 −4
Original line number Diff line number Diff line
@@ -351,15 +351,12 @@ int __init exynos_fdt_map_chipid(unsigned long node, const char *uname, 
 * register the standard cpu IO areas

 */



void __init exynos_init_io(struct map_desc *mach_desc, int size)

void __init exynos_init_io(void)

{

	debug_ll_io_init();



	of_scan_flat_dt(exynos_fdt_map_chipid, NULL);



	if (mach_desc)

		iotable_init(mach_desc, size);



	/* detect cpu id and rev. */

	s5p_init_cpu(S5P_VA_CHIPID);

arch/arm/mach-exynos/common.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void exynos_init_time(void); 
extern unsigned long xxti_f, xusbxti_f;



struct map_desc;

void exynos_init_io(struct map_desc *mach_desc, int size);

void exynos_init_io(void);

void exynos4_restart(char mode, const char *cmd);

void exynos5_restart(char mode, const char *cmd);

void exynos_init_late(void);

arch/arm/mach-exynos/mach-exynos4-dt.c

+1 −6
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ 


#include "common.h"



static void __init exynos4_dt_map_io(void)

{

	exynos_init_io(NULL, 0);

}



static void __init exynos4_dt_machine_init(void)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
@@ -55,7 +50,7 @@ static void __init exynos4_reserve(void) 
DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")

	/* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */

	.smp		= smp_ops(exynos_smp_ops),

	.map_io		= exynos4_dt_map_io,

	.map_io		= exynos_init_io,

	.init_early	= exynos_firmware_init,

	.init_machine	= exynos4_dt_machine_init,

	.init_late	= exynos_init_late,

arch/arm/mach-exynos/mach-exynos5-dt.c

+1 −6
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ 


#include "common.h"



static void __init exynos5_dt_map_io(void)

{

	exynos_init_io(NULL, 0);

}



static void __init exynos5_dt_machine_init(void)

{

	struct device_node *i2c_np;
@@ -77,7 +72,7 @@ static void __init exynos5_reserve(void) 
DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)")

	/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */

	.smp		= smp_ops(exynos_smp_ops),

	.map_io		= exynos5_dt_map_io,

	.map_io		= exynos_init_io,

	.init_machine	= exynos5_dt_machine_init,

	.init_late	= exynos_init_late,

	.init_time	= exynos_init_time,

CRA Git | Maintained and supported by SUSTech CRA and CCSE