Commit a181099e authored by Russell King's avatar Russell King
Browse files

ARM: sa11x0: convert to use DEFINE_RES_xxx macros 



Convert StrongARM-11x0 platforms and core SoC code to use the
DEFINE_RES_xxx macros.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 80ea2065

arch/arm/mach-sa1100/assabet.c

+2 −9
Original line number Diff line number Diff line
@@ -152,15 +152,8 @@ static struct flash_platform_data assabet_flash_data = { 
};



static struct resource assabet_flash_resources[] = {

	{

		.start	= SA1100_CS0_PHYS,

		.end	= SA1100_CS0_PHYS + SZ_32M - 1,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= SA1100_CS1_PHYS,

		.end	= SA1100_CS1_PHYS + SZ_32M - 1,

		.flags	= IORESOURCE_MEM,

	}

	DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M),

	DEFINE_RES_MEM(SA1100_CS1_PHYS, SZ_32M),

};

arch/arm/mach-sa1100/badge4.c

+4 −15
Original line number Diff line number Diff line
@@ -39,16 +39,8 @@ 
#include "generic.h"



static struct resource sa1111_resources[] = {

	[0] = {

		.start		= BADGE4_SA1111_BASE,

		.end		= BADGE4_SA1111_BASE + 0x00001fff,

		.flags		= IORESOURCE_MEM,

	},

	[1] = {

		.start		= BADGE4_IRQ_GPIO_SA1111,

		.end		= BADGE4_IRQ_GPIO_SA1111,

		.flags		= IORESOURCE_IRQ,

	},

	[0] = DEFINE_RES_MEM(BADGE4_SA1111_BASE, 0x2000),

	[1] = DEFINE_RES_IRQ(BADGE4_IRQ_GPIO_SA1111),

};



static struct sa1111_platform_data sa1111_info = {
@@ -121,11 +113,8 @@ static struct flash_platform_data badge4_flash_data = { 
	.nr_parts	= ARRAY_SIZE(badge4_partitions),

};



static struct resource badge4_flash_resource = {

	.start		= SA1100_CS0_PHYS,

	.end		= SA1100_CS0_PHYS + SZ_64M - 1,

	.flags		= IORESOURCE_MEM,

};

static struct resource badge4_flash_resource =

	DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_64M);



static int five_v_on __initdata = 0;

arch/arm/mach-sa1100/cerf.c

+3 −10
Original line number Diff line number Diff line
@@ -33,11 +33,7 @@ 
#include "generic.h"



static struct resource cerfuart2_resources[] = {

	[0] = {

		.start	= 0x80030000,

		.end	= 0x8003ffff,

		.flags	= IORESOURCE_MEM,

	},

	[0] = DEFINE_RES_MEM(0x80030000, SZ_64K),

};



static struct platform_device cerfuart2_device = {
@@ -87,11 +83,8 @@ static struct flash_platform_data cerf_flash_data = { 
	.nr_parts	= ARRAY_SIZE(cerf_partitions),

};



static struct resource cerf_flash_resource = {

	.start		= SA1100_CS0_PHYS,

	.end		= SA1100_CS0_PHYS + SZ_32M - 1,

	.flags		= IORESOURCE_MEM,

};

static struct resource cerf_flash_resource =

	DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M);



static void __init cerf_init_irq(void)

{

arch/arm/mach-sa1100/collie.c

+4 −20
Original line number Diff line number Diff line
@@ -48,11 +48,7 @@ 
#include "generic.h"



static struct resource collie_scoop_resources[] = {

	[0] = {

		.start		= 0x40800000,

		.end		= 0x40800fff,

		.flags		= IORESOURCE_MEM,

	},

	[0] = DEFINE_RES_MEM(0x40800000, SZ_4K),

};



static struct scoop_config collie_scoop_setup = {
@@ -221,16 +217,8 @@ device_initcall(collie_uart_init); 




static struct resource locomo_resources[] = {

	[0] = {

		.start		= 0x40000000,

		.end		= 0x40001fff,

		.flags		= IORESOURCE_MEM,

	},

	[1] = {

		.start		= IRQ_GPIO25,

		.end		= IRQ_GPIO25,

		.flags		= IORESOURCE_IRQ,

	},

	[0] = DEFINE_RES_MEM(0x40000000, SZ_8K),

	[1] = DEFINE_RES_IRQ(IRQ_GPIO25),

};



static struct locomo_platform_data locomo_info = {
@@ -303,11 +291,7 @@ static struct flash_platform_data collie_flash_data = { 
};



static struct resource collie_flash_resources[] = {

	{

		.start	= SA1100_CS0_PHYS,

		.end	= SA1100_CS0_PHYS + SZ_32M - 1,

		.flags	= IORESOURCE_MEM,

	}

	DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M),

};



static void __init collie_init(void)

arch/arm/mach-sa1100/generic.c

+16 −77
Original line number Diff line number Diff line
@@ -149,16 +149,8 @@ static void sa11x0_register_device(struct platform_device *dev, void *data) 




static struct resource sa11x0udc_resources[] = {

	[0] = {

		.start	= __PREG(Ser0UDCCR),

		.end	= __PREG(Ser0UDCCR) + 0xffff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_Ser0UDC,

		.end	= IRQ_Ser0UDC,

		.flags	= IORESOURCE_IRQ,

	},

	[0] = DEFINE_RES_MEM(__PREG(Ser0UDCCR), SZ_64K),

	[1] = DEFINE_RES_IRQ(IRQ_Ser0UDC),

};



static u64 sa11x0udc_dma_mask = 0xffffffffUL;
@@ -175,16 +167,8 @@ static struct platform_device sa11x0udc_device = { 
};



static struct resource sa11x0uart1_resources[] = {

	[0] = {

		.start	= __PREG(Ser1UTCR0),

		.end	= __PREG(Ser1UTCR0) + 0xffff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_Ser1UART,

		.end	= IRQ_Ser1UART,

		.flags	= IORESOURCE_IRQ,

	},

	[0] = DEFINE_RES_MEM(__PREG(Ser1UTCR0), SZ_64K),

	[1] = DEFINE_RES_IRQ(IRQ_Ser1UART),

};



static struct platform_device sa11x0uart1_device = {
@@ -195,16 +179,8 @@ static struct platform_device sa11x0uart1_device = { 
};



static struct resource sa11x0uart3_resources[] = {

	[0] = {

		.start	= __PREG(Ser3UTCR0),

		.end	= __PREG(Ser3UTCR0) + 0xffff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_Ser3UART,

		.end	= IRQ_Ser3UART,

		.flags	= IORESOURCE_IRQ,

	},

	[0] = DEFINE_RES_MEM(__PREG(Ser3UTCR0), SZ_64K),

	[1] = DEFINE_RES_IRQ(IRQ_Ser3UART),

};



static struct platform_device sa11x0uart3_device = {
@@ -215,16 +191,8 @@ static struct platform_device sa11x0uart3_device = { 
};



static struct resource sa11x0mcp_resources[] = {

	[0] = {

		.start	= __PREG(Ser4MCCR0),

		.end	= __PREG(Ser4MCCR0) + 0xffff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_Ser4MCP,

		.end	= IRQ_Ser4MCP,

		.flags	= IORESOURCE_IRQ,

	},

	[0] = DEFINE_RES_MEM(__PREG(Ser4MCCR0), SZ_64K),

	[1] = DEFINE_RES_IRQ(IRQ_Ser4MCP),

};



static u64 sa11x0mcp_dma_mask = 0xffffffffUL;
@@ -246,16 +214,8 @@ void sa11x0_register_mcp(struct mcp_plat_data *data) 
}



static struct resource sa11x0ssp_resources[] = {

	[0] = {

		.start	= 0x80070000,

		.end	= 0x8007ffff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_Ser4SSP,

		.end	= IRQ_Ser4SSP,

		.flags	= IORESOURCE_IRQ,

	},

	[0] = DEFINE_RES_MEM(0x80070000, SZ_64K),

	[1] = DEFINE_RES_IRQ(IRQ_Ser4SSP),

};



static u64 sa11x0ssp_dma_mask = 0xffffffffUL;
@@ -272,16 +232,8 @@ static struct platform_device sa11x0ssp_device = { 
};



static struct resource sa11x0fb_resources[] = {

	[0] = {

		.start	= 0xb0100000,

		.end	= 0xb010ffff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= IRQ_LCD,

		.end	= IRQ_LCD,

		.flags	= IORESOURCE_IRQ,

	},

	[0] = DEFINE_RES_MEM(0xb0100000, SZ_64K),

	[1] = DEFINE_RES_IRQ(IRQ_LCD),

};



static struct platform_device sa11x0fb_device = {
@@ -314,23 +266,10 @@ void sa11x0_register_mtd(struct flash_platform_data *flash, 
}



static struct resource sa11x0ir_resources[] = {

	{

		.start	= __PREG(Ser2UTCR0),

		.end	= __PREG(Ser2UTCR0) + 0x24 - 1,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= __PREG(Ser2HSCR0),

		.end	= __PREG(Ser2HSCR0) + 0x1c - 1,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= __PREG(Ser2HSCR2),

		.end	= __PREG(Ser2HSCR2) + 0x04 - 1,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= IRQ_Ser2ICP,

		.end	= IRQ_Ser2ICP,

		.flags	= IORESOURCE_IRQ,

	}

	DEFINE_RES_MEM(__PREG(Ser2UTCR0), 0x24),

	DEFINE_RES_MEM(__PREG(Ser2HSCR0), 0x1c),

	DEFINE_RES_MEM(__PREG(Ser2HSCR2), 0x04),

	DEFINE_RES_IRQ(IRQ_Ser2ICP),

};



static struct platform_device sa11x0ir_device = {