diff options
author | Magnus Damm <damm@opensource.se> | 2013-07-01 07:48:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-21 21:21:35 -0400 |
commit | 65e9f76985abdf9198deae2231648d7e5408caf0 (patch) | |
tree | 93f9e12756aff949d1ce8bda8a01a5707e1774e3 /arch/arm/mach-shmobile | |
parent | b0edd4bfb0850da39eb6a07aa3a87c526d4ca83b (diff) |
ARM: shmobile: emev2 GIO3 resource fix
commit 1eb14ea1e6bcd11d6d0ba937fc39808bb4d3453e upstream.
Fix GIO3 base addresses for EMEV2.
This bug was introduced by 088efd9273b5076a0aead479aa31f1066d182b3e
("mach-shmobile: Emma Mobile EV2 GPIO support V3") which was included in v3.5.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/setup-emev2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c index 899a86c31ec9..1ccddd228112 100644 --- a/arch/arm/mach-shmobile/setup-emev2.c +++ b/arch/arm/mach-shmobile/setup-emev2.c | |||
@@ -287,14 +287,14 @@ static struct gpio_em_config gio3_config = { | |||
287 | static struct resource gio3_resources[] = { | 287 | static struct resource gio3_resources[] = { |
288 | [0] = { | 288 | [0] = { |
289 | .name = "GIO_096", | 289 | .name = "GIO_096", |
290 | .start = 0xe0050100, | 290 | .start = 0xe0050180, |
291 | .end = 0xe005012b, | 291 | .end = 0xe00501ab, |
292 | .flags = IORESOURCE_MEM, | 292 | .flags = IORESOURCE_MEM, |
293 | }, | 293 | }, |
294 | [1] = { | 294 | [1] = { |
295 | .name = "GIO_096", | 295 | .name = "GIO_096", |
296 | .start = 0xe0050140, | 296 | .start = 0xe00501c0, |
297 | .end = 0xe005015f, | 297 | .end = 0xe00501df, |
298 | .flags = IORESOURCE_MEM, | 298 | .flags = IORESOURCE_MEM, |
299 | }, | 299 | }, |
300 | [2] = { | 300 | [2] = { |