From 8ab81bf46896d7510ef6a87d13b8c1269d5d0c7d Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 14 Jun 2011 10:31:09 +0200 Subject: 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 Signed-off-by: Linus Walleij Change-Id: If8df56ce31da8e006e5b29636432113a16413321 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25015 Reviewed-by: Linus WALLEIJ Tested-by: Linus WALLEIJ Reviewed-by: Robert MARKLUND --- arch/arm/mach-ux500/board-mop500.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'arch/arm/mach-ux500/board-mop500.h') 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) -- cgit v1.2.3