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

Commit 5d7220ec authored by Magnus Damm's avatar Magnus Damm Committed by Rafael J. Wysocki
Browse files

ARM: mach-shmobile: sh7372 map_io and init_early update 



Update the sh7372 SoC and the AP4EVB and Mackerel boards to make use
of the functions sh7372_map_io() and sh7372_add_early_devices().

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

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

+2 −23
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 


#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <asm/setup.h>
@@ -1190,27 +1189,6 @@ static struct i2c_board_info i2c1_devices[] = { 
	},

};



static struct map_desc ap4evb_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 ap4evb_map_io(void)

{

	iotable_init(ap4evb_io_desc, ARRAY_SIZE(ap4evb_io_desc));



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

	sh7372_add_early_devices();

	shmobile_setup_console();

}



#define GPIO_PORT9CR	0xE6051009

#define GPIO_PORT10CR	0xE605100A

#define USCCR1		0xE6058144
@@ -1469,7 +1447,8 @@ static struct sys_timer ap4evb_timer = { 
};



MACHINE_START(AP4EVB, "ap4evb")

	.map_io		= ap4evb_map_io,

	.map_io		= sh7372_map_io,

	.init_early	= sh7372_add_early_devices,

	.init_irq	= sh7372_init_irq,

	.handle_irq	= shmobile_handle_irq_intc,

	.init_machine	= ap4evb_init,

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

+2 −23
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 


#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/mach/map.h>

#include <asm/mach-types.h>



/*
@@ -1337,27 +1336,6 @@ static struct i2c_board_info i2c1_devices[] = { 
	},

};



static struct map_desc mackerel_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 mackerel_map_io(void)

{

	iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc));



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

	sh7372_add_early_devices();

	shmobile_setup_console();

}



#define GPIO_PORT9CR	0xE6051009

#define GPIO_PORT10CR	0xE605100A

#define GPIO_PORT167CR	0xE60520A7
@@ -1587,7 +1565,8 @@ static struct sys_timer mackerel_timer = { 
};



MACHINE_START(MACKEREL, "mackerel")

	.map_io		= mackerel_map_io,

	.map_io		= sh7372_map_io,

	.init_early	= sh7372_add_early_devices,

	.init_irq	= sh7372_init_irq,

	.handle_irq	= shmobile_handle_irq_intc,

	.init_machine	= mackerel_init,

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

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ extern struct clk sh7377_extalc1_clk; 
extern struct clk sh7377_extal2_clk;



extern void sh7372_init_irq(void);

extern void sh7372_map_io(void);

extern void sh7372_add_early_devices(void);

extern void sh7372_add_standard_devices(void);

extern void sh7372_clock_init(void);

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

+22 −0
Original line number Diff line number Diff line
@@ -33,9 +33,28 @@ 
#include <linux/pm_domain.h>

#include <mach/hardware.h>

#include <mach/sh7372.h>

#include <mach/common.h>

#include <asm/mach/map.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>



static struct map_desc sh7372_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 sh7372_map_io(void)

{

	iotable_init(sh7372_io_desc, ARRAY_SIZE(sh7372_io_desc));

}



/* SCIFA0 */

static struct plat_sci_port scif0_platform_data = {

	.mapbase	= 0xe6c40000,
@@ -1049,4 +1068,7 @@ void __init sh7372_add_early_devices(void) 
{

	early_platform_add_devices(sh7372_early_devices,

				   ARRAY_SIZE(sh7372_early_devices));



	/* setup early console here as well */

	shmobile_setup_console();

}