aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-07-01 07:48:07 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-07-01 23:28:01 -0400
commit1eb14ea1e6bcd11d6d0ba937fc39808bb4d3453e (patch)
tree304571bdf70d45bad69cc3cfe82367ff0fbc6328 /arch/arm
parentf820b60582f75e73e83b8505d7e48fe59770f558 (diff)
ARM: shmobile: emev2 GIO3 resource fix
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> Cc: stable@vger.kernel.org
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-shmobile/setup-emev2.c8
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 = {
287static struct resource gio3_resources[] = { 287static 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] = {