Commit cb5e2399 authored by Russell King's avatar Russell King

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d65b4e98
...@@ -181,7 +181,7 @@ static struct flash_platform_data hackkit_flash_data = { ...@@ -181,7 +181,7 @@ static struct flash_platform_data hackkit_flash_data = {
static struct resource hackkit_flash_resource = { static struct resource hackkit_flash_resource = {
.start = SA1100_CS0_PHYS, .start = SA1100_CS0_PHYS,
.end = SA1100_CS0_PHYS + SZ_32M, .end = SA1100_CS0_PHYS + SZ_32M - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}; };
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
/* memory space (line 52 of HP's doc) */ /* memory space (line 52 of HP's doc) */
#define SA1111REGSTART 0x40000000 #define SA1111REGSTART 0x40000000
#define SA1111REGLEN 0x00001fff #define SA1111REGLEN 0x00002000
#define EPSONREGSTART 0x48000000 #define EPSONREGSTART 0x48000000
#define EPSONREGLEN 0x00100000 #define EPSONREGLEN 0x00100000
#define EPSONFBSTART 0x48200000 #define EPSONFBSTART 0x48200000
...@@ -176,12 +176,12 @@ static struct s1d13xxxfb_pdata s1d13xxxfb_data = { ...@@ -176,12 +176,12 @@ static struct s1d13xxxfb_pdata s1d13xxxfb_data = {
static struct resource s1d13xxxfb_resources[] = { static struct resource s1d13xxxfb_resources[] = {
[0] = { [0] = {
.start = EPSONFBSTART, .start = EPSONFBSTART,
.end = EPSONFBSTART + EPSONFBLEN, .end = EPSONFBSTART + EPSONFBLEN - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
.start = EPSONREGSTART, .start = EPSONREGSTART,
.end = EPSONREGSTART + EPSONREGLEN, .end = EPSONREGSTART + EPSONREGLEN - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
} }
}; };
...@@ -199,7 +199,7 @@ static struct platform_device s1d13xxxfb_device = { ...@@ -199,7 +199,7 @@ static struct platform_device s1d13xxxfb_device = {
static struct resource sa1111_resources[] = { static struct resource sa1111_resources[] = {
[0] = { [0] = {
.start = SA1111REGSTART, .start = SA1111REGSTART,
.end = SA1111REGSTART + SA1111REGLEN, .end = SA1111REGSTART + SA1111REGLEN - 1,
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
[1] = { [1] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment