aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/jornada720.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-12 05:59:21 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-09 10:34:11 -0500
commitcb5e2399f9e504dc78525988c85882643e915da4 (patch)
tree557fe14f3aafb12237ead123a95c0b510b423ba2 /arch/arm/mach-sa1100/jornada720.c
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/arm/mach-sa1100/jornada720.c')
-rw-r--r--arch/arm/mach-sa1100/jornada720.c8
1 files changed, 4 insertions, 4 deletions
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 @@
46 46
47/* memory space (line 52 of HP's doc) */ 47/* memory space (line 52 of HP's doc) */
48#define SA1111REGSTART 0x40000000 48#define SA1111REGSTART 0x40000000
49#define SA1111REGLEN 0x00001fff 49#define SA1111REGLEN 0x00002000
50#define EPSONREGSTART 0x48000000 50#define EPSONREGSTART 0x48000000
51#define EPSONREGLEN 0x00100000 51#define EPSONREGLEN 0x00100000
52#define EPSONFBSTART 0x48200000 52#define EPSONFBSTART 0x48200000
@@ -176,12 +176,12 @@ static struct s1d13xxxfb_pdata s1d13xxxfb_data = {
176static struct resource s1d13xxxfb_resources[] = { 176static struct resource s1d13xxxfb_resources[] = {
177 [0] = { 177 [0] = {
178 .start = EPSONFBSTART, 178 .start = EPSONFBSTART,
179 .end = EPSONFBSTART + EPSONFBLEN, 179 .end = EPSONFBSTART + EPSONFBLEN - 1,
180 .flags = IORESOURCE_MEM, 180 .flags = IORESOURCE_MEM,
181 }, 181 },
182 [1] = { 182 [1] = {
183 .start = EPSONREGSTART, 183 .start = EPSONREGSTART,
184 .end = EPSONREGSTART + EPSONREGLEN, 184 .end = EPSONREGSTART + EPSONREGLEN - 1,
185 .flags = IORESOURCE_MEM, 185 .flags = IORESOURCE_MEM,
186 } 186 }
187}; 187};
@@ -199,7 +199,7 @@ static struct platform_device s1d13xxxfb_device = {
199static struct resource sa1111_resources[] = { 199static struct resource sa1111_resources[] = {
200 [0] = { 200 [0] = {
201 .start = SA1111REGSTART, 201 .start = SA1111REGSTART,
202 .end = SA1111REGSTART + SA1111REGLEN, 202 .end = SA1111REGSTART + SA1111REGLEN - 1,
203 .flags = IORESOURCE_MEM, 203 .flags = IORESOURCE_MEM,
204 }, 204 },
205 [1] = { 205 [1] = {