diff options
| author | Robby Cai <R63905@freescale.com> | 2009-11-06 13:55:44 +0800 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2010-03-25 14:00:34 -0400 |
| commit | 245d91e22bb4c2c143367241f837e18b12c09cb7 (patch) | |
| tree | 8ba6c9d659c4abfa0fb7f2eb5919957039225dc3 /arch/arm/plat-stmp3xxx | |
| parent | 29ca255b100d2189db96faff1e74703010e4d5a8 (diff) | |
ENGR00118046-1 fix the resource .end assignment
IIM resource has overlap with PXP resource
Fix all potential conflict by this patch
Signed-off-by: Robby Cai <R63905@freescale.com>
Diffstat (limited to 'arch/arm/plat-stmp3xxx')
| -rw-r--r-- | arch/arm/plat-stmp3xxx/devices.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/plat-stmp3xxx/devices.c b/arch/arm/plat-stmp3xxx/devices.c index 406631a5a5c6..37f00d95fd32 100644 --- a/arch/arm/plat-stmp3xxx/devices.c +++ b/arch/arm/plat-stmp3xxx/devices.c @@ -3,7 +3,7 @@ * * Embedded Alley Solutions, Inc <source@embeddedalley.com> * -* Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved. +* Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved. */ @@ -57,7 +57,7 @@ static struct resource appuart_resources[] = { .flags = IORESOURCE_IRQ, }, { .start = REGS_UARTAPP1_PHYS, - .end = REGS_UARTAPP1_PHYS + REGS_UARTAPP_SIZE, + .end = REGS_UARTAPP1_PHYS + REGS_UARTAPP_SIZE - 1, .flags = IORESOURCE_MEM, }, { /* Rx DMA channel */ @@ -135,7 +135,7 @@ static struct resource gpmi_resources[] = { { .flags = IORESOURCE_MEM, .start = REGS_GPMI_PHYS, - .end = REGS_GPMI_PHYS + REGS_GPMI_SIZE, + .end = REGS_GPMI_PHYS + REGS_GPMI_SIZE - 1, }, { .flags = IORESOURCE_IRQ, .start = IRQ_GPMI_DMA, @@ -162,7 +162,7 @@ static struct resource mmc1_resource[] = { { .flags = IORESOURCE_MEM, .start = REGS_SSP1_PHYS, - .end = REGS_SSP1_PHYS + REGS_SSP_SIZE, + .end = REGS_SSP1_PHYS + REGS_SSP_SIZE - 1, }, { .flags = IORESOURCE_DMA, .start = STMP3XXX_DMA(1, STMP3XXX_BUS_APBH), @@ -192,7 +192,7 @@ struct platform_device stmp3xxx_mmc = { static struct resource rtc_resources[] = { { .start = REGS_RTC_PHYS, - .end = REGS_RTC_PHYS + REGS_RTC_SIZE, + .end = REGS_RTC_PHYS + REGS_RTC_SIZE - 1, .flags = IORESOURCE_MEM, }, { .start = IRQ_RTC_ALARM, @@ -215,7 +215,7 @@ struct platform_device stmp3xxx_rtc = { static struct resource ssp1_resources[] = { { .start = REGS_SSP1_PHYS, - .end = REGS_SSP1_PHYS + REGS_SSP_SIZE, + .end = REGS_SSP1_PHYS + REGS_SSP_SIZE - 1, .flags = IORESOURCE_MEM, }, { .start = IRQ_SSP1_DMA, @@ -231,7 +231,7 @@ static struct resource ssp1_resources[] = { static struct resource ssp2_resources[] = { { .start = REGS_SSP2_PHYS, - .end = REGS_SSP2_PHYS + REGS_SSP_SIZE, + .end = REGS_SSP2_PHYS + REGS_SSP_SIZE - 1, .flags = IORESOURCE_MEM, }, { .start = IRQ_SSP2_DMA, @@ -278,7 +278,7 @@ static struct resource fb_resource[] = { }, { .flags = IORESOURCE_MEM, .start = REGS_LCDIF_PHYS, - .end = REGS_LCDIF_PHYS + REGS_LCDIF_SIZE, + .end = REGS_LCDIF_PHYS + REGS_LCDIF_SIZE - 1, }, }; |