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

Commit 237caf9e authored by Magnus Damm's avatar Magnus Damm Committed by Rafael J. Wysocki
Browse files

ARM: mach-shmobile: sh7367 map_io and init_early update 



Update the sh7367 SoC and the G3EVM board to make use of the
functions sh7367_map_io() and sh7367_add_early_devices().

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 84c36ffd

arch/arm/mach-shmobile/board-g3evm.c

+2 −23
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <mach/common.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>



/*
@@ -246,27 +245,6 @@ static struct platform_device *g3evm_devices[] __initdata = { 
	&irda_device,

};



static struct map_desc g3evm_io_desc[] __initdata = {

	/* create a 1:1 entity map for 0xe6xxxxxx

	 * used by CPGA, INTC and PFC.

	 */

	{

		.virtual	= 0xe6000000,

		.pfn		= __phys_to_pfn(0xe6000000),

		.length		= 256 << 20,

		.type		= MT_DEVICE_NONSHARED

	},

};



static void __init g3evm_map_io(void)

{

	iotable_init(g3evm_io_desc, ARRAY_SIZE(g3evm_io_desc));



	/* setup early devices and console here as well */

	sh7367_add_early_devices();

	shmobile_setup_console();

}



static void __init g3evm_init(void)

{

	sh7367_pinmux_init();
@@ -365,7 +343,8 @@ static struct sys_timer g3evm_timer = { 
};



MACHINE_START(G3EVM, "g3evm")

	.map_io		= g3evm_map_io,

	.map_io		= sh7367_map_io,

	.init_early	= sh7367_add_early_devices,

	.init_irq	= sh7367_init_irq,

	.handle_irq	= shmobile_handle_irq_intc,

	.init_machine	= g3evm_init,

arch/arm/mach-shmobile/include/mach/common.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ extern void (*shmobile_cpuidle_modes[])(void); 
extern void (*shmobile_cpuidle_setup)(struct cpuidle_driver *drv);



extern void sh7367_init_irq(void);

extern void sh7367_map_io(void);

extern void sh7367_add_early_devices(void);

extern void sh7367_add_standard_devices(void);

extern void sh7367_clock_init(void);

arch/arm/mach-shmobile/setup-sh7367.c

+22 −0
Original line number Diff line number Diff line
@@ -29,8 +29,27 @@ 
#include <linux/serial_sci.h>

#include <linux/sh_timer.h>

#include <mach/hardware.h>

#include <mach/common.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>



static struct map_desc sh7367_io_desc[] __initdata = {

	/* create a 1:1 entity map for 0xe6xxxxxx

	 * used by CPGA, INTC and PFC.

	 */

	{

		.virtual	= 0xe6000000,

		.pfn		= __phys_to_pfn(0xe6000000),

		.length		= 256 << 20,

		.type		= MT_DEVICE_NONSHARED

	},

};



void __init sh7367_map_io(void)

{

	iotable_init(sh7367_io_desc, ARRAY_SIZE(sh7367_io_desc));

}



/* SCIFA0 */

static struct plat_sci_port scif0_platform_data = {
@@ -445,4 +464,7 @@ void __init sh7367_add_early_devices(void) 


	early_platform_add_devices(sh7367_early_devices,

				   ARRAY_SIZE(sh7367_early_devices));



	/* setup early console here as well */

	shmobile_setup_console();

}