summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2011-06-14 10:31:09 +0200
committerRobert MARKLUND <robert.marklund@stericsson.com>2011-06-14 10:51:51 +0200
commit8ab81bf46896d7510ef6a87d13b8c1269d5d0c7d (patch)
treea647f9412bf65e921aec50399d22fb2941fcc4c9
parent28d6d027903844aa7bd3a1d9d7ede21c0178a9fb (diff)
mach-ux500: fix GPIO enumerator
The GPIO enumerators for some GPIO pins were screwed up. Old enumerators >= 268 are on the TC expander in pre-v60 hardware. Reported-by: Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Change-Id: If8df56ce31da8e006e5b29636432113a16413321 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25015 Reviewed-by: Linus WALLEIJ <linus.walleij@stericsson.com> Tested-by: Linus WALLEIJ <linus.walleij@stericsson.com> Reviewed-by: Robert MARKLUND <robert.marklund@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/board-mop500.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h
index b4bc321357a..87bd49b08a6 100644
--- a/arch/arm/mach-ux500/board-mop500.h
+++ b/arch/arm/mach-ux500/board-mop500.h
@@ -27,9 +27,6 @@
/* MOP500 generic GPIOs */
#define MOP500_HDMI_RST_GPIO 196
-#define MOP500_DISP2_RST_GPIO 282
-#define MOP500_DISP1_RST_GPIO 283
-
/* GPIOs on the TC35892 expander */
#define MOP500_EGPIO(x) (NOMADIK_NR_GPIO + (x))
@@ -40,6 +37,8 @@
#define GPIO_ACCEL_INT1 MOP500_EGPIO(10)
#define GPIO_ACCEL_INT2 MOP500_EGPIO(11)
#define GPIO_BU21013_CS MOP500_EGPIO(13)
+#define MOP500_DISP2_RST_GPIO MOP500_EGPIO(14)
+#define MOP500_DISP1_RST_GPIO MOP500_EGPIO(15)
#define GPIO_SDMMC_EN MOP500_EGPIO(17)
#define GPIO_SDMMC_1V8_3V_SEL MOP500_EGPIO(18)
#define MOP500_EGPIO_END MOP500_EGPIO(24)