summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-12 10:59:21 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-09 15:34:11 +0000
commitcb5e2399f9e504dc78525988c85882643e915da4 (patch)
tree557fe14f3aafb12237ead123a95c0b510b423ba2 /arch
parentd65b4e98d7ea3038b767b70fe8be959b2913f16d (diff)
ARM: sa11x0: fix off-by-one resource sizes
Hackkit defined its flash memory resource to be 32M + 1 byte. Jornada defined the Epson video controller resources to be one byte larger than they should be, and mis-mapped the SA-1111 companion chip one byte smaller than it should be. Fix these. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-sa1100/hackkit.c2
-rw-r--r--arch/arm/mach-sa1100/jornada720.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c
index c01bb36db940..9092b3aff534 100644
--- a/arch/arm/mach-sa1100/hackkit.c
+++ b/arch/arm/mach-sa1100/hackkit.c
@@ -181,7 +181,7 @@ static struct flash_platform_data hackkit_flash_data = {
static struct resource hackkit_flash_resource = {
.start = SA1100_CS0_PHYS,
- .end = SA1100_CS0_PHYS + SZ_32M,
+ .end = SA1100_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM,
};
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index ee121d6f0480..5393b06ee2d2 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -46,7 +46,7 @@
/* memory space (line 52 of HP's doc) */
#define SA1111REGSTART 0x40000000
-#define SA1111REGLEN 0x00001fff
+#define SA1111REGLEN 0x00002000
#define EPSONREGSTART 0x48000000
#define EPSONREGLEN 0x00100000
#define EPSONFBSTART 0x48200000
@@ -176,12 +176,12 @@ static struct s1d13xxxfb_pdata s1d13xxxfb_data = {
static struct resource s1d13xxxfb_resources[] = {
[0] = {
.start = EPSONFBSTART,
- .end = EPSONFBSTART + EPSONFBLEN,
+ .end = EPSONFBSTART + EPSONFBLEN - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = EPSONREGSTART,
- .end = EPSONREGSTART + EPSONREGLEN,
+ .end = EPSONREGSTART + EPSONREGLEN - 1,
.flags = IORESOURCE_MEM,
}
};
@@ -199,7 +199,7 @@ static struct platform_device s1d13xxxfb_device = {
static struct resource sa1111_resources[] = {
[0] = {
.start = SA1111REGSTART,
- .end = SA1111REGSTART + SA1111REGLEN,
+ .end = SA1111REGSTART + SA1111REGLEN - 1,
.flags = IORESOURCE_MEM,
},
[1] = {