ARM: mach-shmobile: sh7377 map_io and init_early update (bfc46f3e) · Commits · 戴 / test

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

+2 −23

Original line number	Diff line number	Diff line
		@@ -38,7 +38,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>

		/*
		@@ -260,27 +259,6 @@ static struct platform_device *g4evm_devices[] __initdata = {
		&sdhi1_device,
		};

		static struct map_desc g4evm_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 g4evm_map_io(void)
		{
		iotable_init(g4evm_io_desc, ARRAY_SIZE(g4evm_io_desc));

		/* setup early devices and console here as well */
		sh7377_add_early_devices();
		shmobile_setup_console();
		}

		#define GPIO_SDHID0_D0 0xe60520fc
		#define GPIO_SDHID0_D1 0xe60520fd
		#define GPIO_SDHID0_D2 0xe60520fe
		@@ -408,7 +386,8 @@ static struct sys_timer g4evm_timer = {
		};

		MACHINE_START(G4EVM, "g4evm")
		.map_io = g4evm_map_io,
		.map_io = sh7377_map_io,
		.init_early = sh7377_add_early_devices,
		.init_irq = sh7377_init_irq,
		.handle_irq = shmobile_handle_irq_intc,
		.init_machine = g4evm_init,

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ extern struct clk sh7367_extalb1_clk;
		extern struct clk sh7367_extal2_clk;

		extern void sh7377_init_irq(void);
		extern void sh7377_map_io(void);
		extern void sh7377_add_early_devices(void);
		extern void sh7377_add_standard_devices(void);
		extern void sh7377_clock_init(void);

+22 −0

Original line number	Diff line number	Diff line
		@@ -30,9 +30,28 @@
		#include <linux/sh_intc.h>
		#include <linux/sh_timer.h>
		#include <mach/hardware.h>
		#include <mach/common.h>
		#include <asm/mach/map.h>
		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>

		static struct map_desc sh7377_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 sh7377_map_io(void)
		{
		iotable_init(sh7377_io_desc, ARRAY_SIZE(sh7377_io_desc));
		}

		/* SCIFA0 */
		static struct plat_sci_port scif0_platform_data = {
		.mapbase = 0xe6c40000,
		@@ -466,4 +485,7 @@ void __init sh7377_add_early_devices(void)

		early_platform_add_devices(sh7377_early_devices,
		ARRAY_SIZE(sh7377_early_devices));

		/* setup early console here as well */
		shmobile_setup_console();
		}