[PATCH V5 29/63] ST SPEAr: Changing resource size of amba devices to SZ_4K

[Russell King - ARM Linux]

This is another patch which should be reorganized - move the CLCD bits
into the CLCD patch and arrange for it to be applied early on in the
series.

On Thu, Jan 20, 2011 at 12:56:07PM +0530, Viresh Kumar wrote:
> Signed-off-by: Viresh Kumar <viresh.kumar at st.com>
> Signed-off-by: Rajeev Kumar <rajeev-dlh.kumar at st.com>
> ---
>  arch/arm/mach-spear3xx/spear300.c |    2 +-
>  arch/arm/mach-spear3xx/spear320.c |    2 +-
>  arch/arm/mach-spear3xx/spear3xx.c |    2 +-
>  arch/arm/mach-spear6xx/spear6xx.c |    8 +++-----
>  4 files changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
> index fceb71f..6989407 100644
> --- a/arch/arm/mach-spear3xx/spear300.c
> +++ b/arch/arm/mach-spear3xx/spear300.c
> @@ -382,7 +382,7 @@ struct amba_device clcd_device = {
>  	},
>  	.res = {
>  		.start = SPEAR300_CLCD_BASE,
> -		.end = SPEAR300_CLCD_BASE + SPEAR300_CLCD_SIZE - 1,
> +		.end = SPEAR300_CLCD_BASE + SZ_4K - 1,
>  		.flags = IORESOURCE_MEM,
>  	},
>  	.dma_mask = ~0,
> diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c
> index 6ab35db..ab4ad8e 100644
> --- a/arch/arm/mach-spear3xx/spear320.c
> +++ b/arch/arm/mach-spear3xx/spear320.c
> @@ -399,7 +399,7 @@ struct amba_device clcd_device = {
>  	},
>  	.res = {
>  		.start = SPEAR320_CLCD_BASE,
> -		.end = SPEAR320_CLCD_BASE + SPEAR320_CLCD_SIZE - 1,
> +		.end = SPEAR320_CLCD_BASE + SZ_4K - 1,
>  		.flags = IORESOURCE_MEM,
>  	},
>  	.dma_mask = ~0,
> diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c
> index 9d6d125..6be49b3 100644
> --- a/arch/arm/mach-spear3xx/spear3xx.c
> +++ b/arch/arm/mach-spear3xx/spear3xx.c
> @@ -79,7 +79,7 @@ struct amba_device uart_device = {
>  	},
>  	.res = {
>  		.start = SPEAR3XX_ICM1_UART_BASE,
> -		.end = SPEAR3XX_ICM1_UART_BASE + SPEAR3XX_ICM1_UART_SIZE - 1,
> +		.end = SPEAR3XX_ICM1_UART_BASE + SZ_4K - 1,
>  		.flags = IORESOURCE_MEM,
>  	},
>  	.irq = {IRQ_UART, NO_IRQ},
> diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c
> index f39538e..a948dd4 100644
> --- a/arch/arm/mach-spear6xx/spear6xx.c
> +++ b/arch/arm/mach-spear6xx/spear6xx.c
> @@ -35,7 +35,7 @@ struct amba_device clcd_device = {
>  	},
>  	.res = {
>  		.start = SPEAR6XX_ICM3_CLCD_BASE,
> -		.end = SPEAR6XX_ICM3_CLCD_BASE + SPEAR6XX_ICM3_CLCD_SIZE - 1,
> +		.end = SPEAR6XX_ICM3_CLCD_BASE + SZ_4K - 1,
>  		.flags = IORESOURCE_MEM,
>  	},
>  	.dma_mask = ~0,
> @@ -117,8 +117,7 @@ struct amba_device uart_device[] = {
>  		},
>  		.res = {
>  			.start = SPEAR6XX_ICM1_UART0_BASE,
> -			.end = SPEAR6XX_ICM1_UART0_BASE +
> -				SPEAR6XX_ICM1_UART0_SIZE - 1,
> +			.end = SPEAR6XX_ICM1_UART0_BASE + SZ_4K - 1,
>  			.flags = IORESOURCE_MEM,
>  		},
>  		.irq = {IRQ_UART_0, NO_IRQ},
> @@ -128,8 +127,7 @@ struct amba_device uart_device[] = {
>  		},
>  		.res = {
>  			.start = SPEAR6XX_ICM1_UART1_BASE,
> -			.end = SPEAR6XX_ICM1_UART1_BASE +
> -				SPEAR6XX_ICM1_UART1_SIZE - 1,
> +			.end = SPEAR6XX_ICM1_UART1_BASE + SZ_4K - 1,
>  			.flags = IORESOURCE_MEM,
>  		},
>  		.irq = {IRQ_UART_1, NO_IRQ},
> -- 
> 1.7.3.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel