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

Commit 50e15c34 authored by Magnus Damm's avatar Magnus Damm Committed by Rafael J. Wysocki
Browse files

ARM: mach-shmobile: sh73a0 map_io and init_early update 



Update the sh73a0 SoC and the AG5EVM and Kota2 boards to make use
of the functions sh73a0_map_io() and sh73a0_add_early_devices().

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

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

+2 −23
Original line number Diff line number Diff line
@@ -46,7 +46,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>

#include <asm/hardware/gic.h>

#include <asm/hardware/cache-l2x0.h>
@@ -486,27 +485,6 @@ static struct platform_device *ag5evm_devices[] __initdata = { 
	&sdhi1_device,

};



static struct map_desc ag5evm_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 ag5evm_map_io(void)

{

	iotable_init(ag5evm_io_desc, ARRAY_SIZE(ag5evm_io_desc));



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

	sh73a0_add_early_devices();

	shmobile_setup_console();

}



static void __init ag5evm_init(void)

{

	sh73a0_pinmux_init();
@@ -634,7 +612,8 @@ struct sys_timer ag5evm_timer = { 
};



MACHINE_START(AG5EVM, "ag5evm")

	.map_io		= ag5evm_map_io,

	.map_io		= sh73a0_map_io,

	.init_early	= sh73a0_add_early_devices,

	.nr_irqs	= NR_IRQS_LEGACY,

	.init_irq	= sh73a0_init_irq,

	.handle_irq	= gic_handle_irq,

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

+2 −23
Original line number Diff line number Diff line
@@ -43,7 +43,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>

#include <asm/hardware/gic.h>

#include <asm/hardware/cache-l2x0.h>
@@ -409,27 +408,6 @@ static struct platform_device *kota2_devices[] __initdata = { 
	&sdhi1_device,

};



static struct map_desc kota2_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 kota2_map_io(void)

{

	iotable_init(kota2_io_desc, ARRAY_SIZE(kota2_io_desc));



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

	sh73a0_add_early_devices();

	shmobile_setup_console();

}



static void __init kota2_init(void)

{

	sh73a0_pinmux_init();
@@ -547,7 +525,8 @@ struct sys_timer kota2_timer = { 
};



MACHINE_START(KOTA2, "kota2")

	.map_io		= kota2_map_io,

	.map_io		= sh73a0_map_io,

	.init_early	= sh73a0_add_early_devices,

	.nr_irqs	= NR_IRQS_LEGACY,

	.init_irq	= sh73a0_init_irq,

	.handle_irq	= gic_handle_irq,

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

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ extern struct clk sh7372_extal1_clk; 
extern struct clk sh7372_extal2_clk;



extern void sh73a0_init_irq(void);

extern void sh73a0_map_io(void);

extern void sh73a0_add_early_devices(void);

extern void sh73a0_add_standard_devices(void);

extern void sh73a0_clock_init(void);

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

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

#include <mach/hardware.h>

#include <mach/sh73a0.h>

#include <mach/common.h>

#include <asm/mach-types.h>

#include <asm/mach/map.h>

#include <asm/mach/arch.h>



static struct map_desc sh73a0_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 sh73a0_map_io(void)

{

	iotable_init(sh73a0_io_desc, ARRAY_SIZE(sh73a0_io_desc));

}



static struct plat_sci_port scif0_platform_data = {

	.mapbase	= 0xe6c40000,

	.flags		= UPF_BOOT_AUTOCONF,
@@ -671,4 +690,7 @@ void __init sh73a0_add_early_devices(void) 
{

	early_platform_add_devices(sh73a0_early_devices,

				   ARRAY_SIZE(sh73a0_early_devices));



	/* setup early console here as well */

	shmobile_setup_console();

}