mx6_r: correct gpio_keys

2 files changed, 21 insertions, 21 deletions

diff --git a/arch/arm/mach-mx6/board-mx6_r.c b/arch/arm/mach-mx6/board-mx6_r.c
index 70b0954afd11..2c33fc757832 100644
--- a/arch/arm/mach-mx6/board-mx6_r.c
+++ b/arch/arm/mach-mx6/board-mx6_r.c
@@ -588,12 +588,13 @@ static const struct pm_platform_data pm_data __initconst = {
 }
 
 static struct gpio_keys_button buttons[] = {
-	GPIO_BUTTON(IMX_GPIO_NR(6, 11), KEY_POWER, 1, "key-power", 1),
-	GPIO_BUTTON(IMX_GPIO_NR(3, 0), KEY_MENU, 1, "key-memu", 0),
+	GPIO_BUTTON(IMX_GPIO_NR(3, 0), KEY_BACK, 1, "key-back", 0),
 	GPIO_BUTTON(IMX_GPIO_NR(3, 1), KEY_HOME, 1, "key-home", 0),
-	GPIO_BUTTON(IMX_GPIO_NR(3, 2), KEY_BACK, 1, "key-back", 0),
-	GPIO_BUTTON(IMX_GPIO_NR(3, 3), KEY_VOLUMEUP, 1, "volume-up", 0),
-	GPIO_BUTTON(IMX_GPIO_NR(4, 5), KEY_VOLUMEDOWN, 1, "volume-down", 0),
+	GPIO_BUTTON(IMX_GPIO_NR(3, 2), KEY_MENU, 1, "key-menu", 0),
+	GPIO_BUTTON(IMX_GPIO_NR(3, 3), KEY_VOLUMEDOWN, 1, "volume-down", 0),
+	GPIO_BUTTON(IMX_GPIO_NR(7, 13), KEY_VOLUMEUP, 1, "volume-up", 0),
+	GPIO_BUTTON(IMX_GPIO_NR(4, 5), KEY_FORWARD, 1, "key-forward", 0),
+	GPIO_BUTTON(IMX_GPIO_NR(7, 1), KEY_POWER, 0, "key-power", 1),
 };
 
 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
diff --git a/arch/arm/mach-mx6/pads-mx6_r.h b/arch/arm/mach-mx6/pads-mx6_r.h
index 4f19512cadc4..c9985d428e0f 100644
--- a/arch/arm/mach-mx6/pads-mx6_r.h
+++ b/arch/arm/mach-mx6/pads-mx6_r.h
@@ -13,6 +13,7 @@
 #endif
 
 #define WEAK_PULLUP		(PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_LOW | PAD_CTL_DSE_40ohm)
+#define WEAK_PULLDN		(PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_LOW | PAD_CTL_DSE_40ohm)
 #define ISL1208_IRQ_PADCFG	(PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
 
 #define N6_IRQ_PADCFG		(PAD_CTL_PUE | PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
@@ -121,9 +122,21 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = {
 	MX6PAD(CSI0_DAT8__ECSPI2_SCLK),
 	MX6PAD(CSI0_DAT11__GPIO_5_29),	/*SS0*/
 
+	/* GPIO_KEYS - J4  */
+	NEW_PAD_CTRL(MX6PAD(EIM_DA0__GPIO_3_0), WEAK_PULLUP),	/* pin 1 - back */
+	NEW_PAD_CTRL(MX6PAD(EIM_DA1__GPIO_3_1), WEAK_PULLUP),	/* pin 2 - Home(left) */
+	NEW_PAD_CTRL(MX6PAD(EIM_DA2__GPIO_3_2), WEAK_PULLUP),	/* pin 3 - Menu */
+	NEW_PAD_CTRL(MX6PAD(EIM_DA3__GPIO_3_3), WEAK_PULLUP),	/* pin 4 - Down */
+	NEW_PAD_CTRL(MX6PAD(GPIO_18__GPIO_7_13), WEAK_PULLUP),	/* pin 5 - up */
+	NEW_PAD_CTRL(MX6PAD(GPIO_19__GPIO_4_5), WEAK_PULLUP),	/* pin 6 - right */
+	NEW_PAD_CTRL(MX6PAD(KEY_COL2__GPIO_4_10), WEAK_PULLUP),	/* pin 7 - NC */
+	NEW_PAD_CTRL(MX6PAD(KEY_ROW2__GPIO_4_11), WEAK_PULLUP),	/* pin 8 - NC */
+	NEW_PAD_CTRL(MX6PAD(SD3_DAT4__GPIO_7_1), WEAK_PULLDN),	/* pin 9 inverted, Main power off request */
+	NEW_PAD_CTRL(MX6PAD(NANDF_CS0__GPIO_6_11), WEAK_PULLUP), /* pin 10 - NC */
+	NEW_PAD_CTRL(MX6PAD(SD1_DAT1__GPIO_1_17), WEAK_PULLUP),	/* pin 11 - NC */
+
 	/* GPIO1 */
 	MX6PAD(SD1_DAT0__GPIO_1_16),	/* Main power enable */
-	MX6PAD(SD1_DAT1__GPIO_1_17),	/* J4 - GP */
 
 	/* GPIO2 */
 	MX6PAD(NANDF_D1__GPIO_2_1),	/* Power 5.4V enable */
@@ -131,28 +144,14 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = {
 	MX6PAD(NANDF_D7__GPIO_2_7),	/* J3 - GP */
 	MX6PAD(EIM_RW__GPIO_2_26),	/* J6 - GP */
 
-	/* GPIO4 */
-	MX6PAD(EIM_DA0__GPIO_3_0),	/* J4 - GP */
-	MX6PAD(EIM_DA1__GPIO_3_1),	/* J4 - GP */
-	MX6PAD(EIM_DA2__GPIO_3_2),	/* J4 - GP */
-	MX6PAD(EIM_DA3__GPIO_3_3),	/* J4 - GP */
+	/* GPIO3 */
 	NEW_PAD_CTRL(MX6PAD(EIM_DA4__GPIO_3_4), WEAK_PULLUP),	/* FXAS21000, int2 */
 	NEW_PAD_CTRL(MX6PAD(EIM_DA5__GPIO_3_5), WEAK_PULLUP),	/* FXAS21000, int2 */
 	MX6PAD(EIM_D20__GPIO_3_20),	/* J6 - GP */
 	MX6PAD(EIM_D29__GPIO_3_29),	/* J6 - GP */
 
-	/* GPIO4 */
-	MX6PAD(GPIO_19__GPIO_4_5),	/* J4 - GP */
-	MX6PAD(KEY_COL2__GPIO_4_10),	/* J4 - GP */
-	MX6PAD(KEY_ROW2__GPIO_4_11),	/* J4 - GP */
-
 	/* GPIO6 */
 	NEW_PAD_CTRL(MX6PAD(NANDF_CLE__GPIO_6_7), ISL1208_IRQ_PADCFG),	/* RTC ISL1208 irq*/
-	MX6PAD(NANDF_CS0__GPIO_6_11),	/* J4 - GP */
-
-	/* GPIO7 */
-	NEW_PAD_CTRL(MX6PAD(SD3_DAT4__GPIO_7_1), WEAK_PULLUP),	/* Main power off request, input */
-	MX6PAD(GPIO_18__GPIO_7_13),	/* J4 - GP */
 
 	/* I2C1, SGTL5000 */
 	MX6PAD(EIM_D21__I2C1_SCL),	/* GPIO3[21] */