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

Commit 7ae1f7ec authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3818/1: iop3xx: introduce arch/arm/plat-iop for shared iop32x/iop33x code 



Introduce the arch/arm/plat-iop directory, for code shared between the
iop32x and iop33x, and move the common memory map setup bits there.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3f7e5815

arch/arm/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ config ARCH_IMX 
config ARCH_IOP32X

	bool "IOP32x-based"

	depends on MMU

	select PLAT_IOP

	select PCI

	help

	  Support for Intel's 80219 and IOP32X (XScale) family of
@@ -213,6 +214,7 @@ config ARCH_IOP32X 
config ARCH_IOP33X

	bool "IOP33x-based"

	depends on MMU

	select PLAT_IOP

	select PCI

	help

	  Support for Intel's IOP33X (XScale) family of processors.
@@ -362,6 +364,9 @@ source "arch/arm/mach-netx/Kconfig" 
config ARCH_ACORN

	bool



config PLAT_IOP

	bool



source arch/arm/mm/Kconfig



#  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) 
core-$(CONFIG_VFP)		+= arch/arm/vfp/



# If we have a common platform directory, then include it in the build.

core-$(CONFIG_PLAT_IOP)		+= arch/arm/plat-iop/

core-$(CONFIG_ARCH_OMAP)	+= arch/arm/plat-omap/



drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

arch/arm/mach-iop32x/iq31244-mm.c

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/page.h>



#include <asm/mach/map.h>

#include <asm/hardware/iop3xx.h>





/*
@@ -39,7 +40,7 @@ static struct map_desc iq31244_io_desc[] __initdata = { 


void __init iq31244_map_io(void)

{

	iop321_map_io();

	iop3xx_map_io();



	iotable_init(iq31244_io_desc, ARRAY_SIZE(iq31244_io_desc));

}

arch/arm/mach-iop32x/iq80321-mm.c

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/page.h>



#include <asm/mach/map.h>

#include <asm/hardware/iop3xx.h>





/*
@@ -39,7 +40,7 @@ static struct map_desc iq80321_io_desc[] __initdata = { 


void __init iq80321_map_io(void)

{

	iop321_map_io();

	iop3xx_map_io();



	iotable_init(iq80321_io_desc, ARRAY_SIZE(iq80321_io_desc));

}

arch/arm/mach-iop32x/setup.c

+0 −22
Original line number Diff line number Diff line
@@ -32,23 +32,6 @@ 


#define IOP321_UART_XTAL 1843200



/*

 * Standard IO mapping for all IOP321 based systems

 */

static struct map_desc iop321_std_desc[] __initdata = {

	 {	/* mem mapped registers */

		.virtual	= IOP321_VIRT_MEM_BASE,

		.pfn		= __phys_to_pfn(IOP321_PHYS_MEM_BASE),

		.length		= 0x00002000,

		.type		= MT_DEVICE

	 }, {	/* PCI IO space */

		.virtual	= IOP321_PCI_LOWER_IO_VA,

		.pfn		= __phys_to_pfn(IOP321_PCI_LOWER_IO_PA),

		.length		= IOP321_PCI_IO_WINDOW_SIZE,

		.type		= MT_DEVICE

	 }

};



#ifdef CONFIG_ARCH_IQ80321

#define UARTBASE IQ80321_UART

#define IRQ_UART IRQ_IQ80321_UART
@@ -126,11 +109,6 @@ void __init iop32x_init(void) 
		platform_add_devices(iop32x_devices,

				ARRAY_SIZE(iop32x_devices));

	}

}



void __init iop321_map_io(void)

{

	iotable_init(iop321_std_desc, ARRAY_SIZE(iop321_std_desc));

	early_serial_setup(&iop321_serial_ports[0]);

}