sp: More GPIO cleanup, button assignments

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>

2 files changed, 13 insertions, 25 deletions

diff --git a/arch/arm/mach-mx6/board-mx6_sp.c b/arch/arm/mach-mx6/board-mx6_sp.c
index ec6fbbc0b896..c785e3da041d 100644
--- a/arch/arm/mach-mx6/board-mx6_sp.c
+++ b/arch/arm/mach-mx6/board-mx6_sp.c
@@ -100,12 +100,11 @@
 #define WL_CLK_REQ_IRQ		IMX_GPIO_NR(6, 9)	/* NANDF_WP_B - active low */
 #define WL_WAKE_IRQ		IMX_GPIO_NR(6, 14)	/* NANDF_CS1 - active low */
 
-#define MX6_N6L_GLED			IMX_GPIO_NR(1, 2)	/* J14 pin1: GPIO2 */
-#define MX6_N6L_RLED			IMX_GPIO_NR(1, 3)	/* J14 pin3: GPIO3 */
-#define MX6_N6L_DRYCONTACT		IMX_GPIO_NR(1, 6)	/* J14 pins 8 and 9 - dry contact */
-#define MX6_N6L_DRYCONTACT2		IMX_GPIO_NR(1, 7)	/* J46 pins 2 and 3 - dry contact */
-#define MX6_N6L_VOLUP			IMX_GPIO_NR(7, 13)	/* J14 pin5: GPIO_18 */
-#define MX6_N6L_VOLDOWN			IMX_GPIO_NR(4, 5)	/* J14 pin7: GPIO_19 */
+#define GPIO7_OUT		IMX_GPIO_NR(1, 7)	/* J46 */
+#define GPIO8_OUT		IMX_GPIO_NR(1, 8)	/* J46 */
+#define GPIO18_IN		IMX_GPIO_NR(7, 13)	/* J46: Back */
+#define GPIO19_IN		IMX_GPIO_NR(4, 5)	/* J46: Home */
+#define ONOFF			IMX_GPIO_NR(3, 29)	/* J46 */
 
 #include "pads-mx6_sp.h"
 #define FOR_DL_SOLO
@@ -510,8 +509,8 @@ static struct mxc_dvfs_platform_data oc_dvfscore_data = {
 }
 
 static struct gpio_keys_button buttons[] = {
-	GPIO_BUTTON(MX6_N6L_VOLUP, KEY_HOME, 1, "volume-up", 0),
-	GPIO_BUTTON(MX6_N6L_VOLDOWN, KEY_BACK, 1, "volume-down", 0),
+	GPIO_BUTTON(GPIO18_IN, KEY_BACK, 1, "Back", 0),
+	GPIO_BUTTON(GPIO19_IN, KEY_HOME, 1, "Home", 0),
 };
 
 static struct gpio_keys_platform_data button_data = {
diff --git a/arch/arm/mach-mx6/pads-mx6_sp.h b/arch/arm/mach-mx6/pads-mx6_sp.h
index 2b77aa904339..b4e86b2ae16d 100644
--- a/arch/arm/mach-mx6/pads-mx6_sp.h
+++ b/arch/arm/mach-mx6/pads-mx6_sp.h
@@ -78,18 +78,8 @@
 #define WEAK_PD (PAD_CTL_PUE | PAD_CTL_PUS_100K_DOWN | PAD_CTL_DSE_240ohm | PAD_CTL_SPEED_LOW)
 
 static iomux_v3_cfg_t MX6NAME(common_pads)[] = {
-	/* Audio - SGTL5000 I2C1 */
-	MX6PAD(CSI0_DAT4__AUDMUX_AUD3_TXC),
-	MX6PAD(CSI0_DAT5__AUDMUX_AUD3_TXD),
-	MX6PAD(CSI0_DAT6__AUDMUX_AUD3_TXFS),
-	MX6PAD(CSI0_DAT7__AUDMUX_AUD3_RXD),
-	MX6PAD(GPIO_0__CCM_CLKO),		/* SGTL5000 sys_mclk */
-	NEW_PAD_CTRL(MX6PAD(EIM_A25__GPIO_5_2), WEAK), /* BMUTE active low */
-
 	/*
 	 * Display - LVDS - Backlight
-	 * 6.5 inch is VGA 640x480,
-	 * 10.4 is 1024x768
 	 */
 	NEW_PAD_CTRL(MX6PAD(SD1_CMD__PWM4_PWMO), WEAK),		/* GPIO1[18], J9 pin 10 */
 
@@ -186,13 +176,12 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = {
 	SD_PINS8(4, USDHC_PAD_CTRL_50MHZ),
 	MX6PAD(NANDF_D7__GPIO_2_7),			/* eMMC reset */
 
-	/* GPIO connector (J14) */
-	NEW_PAD_CTRL(MX6PAD(GPIO_2__GPIO_1_2), WEAK),	/* J14 pin1 - GLED */
-	NEW_PAD_CTRL(MX6PAD(GPIO_3__GPIO_1_3), WEAK),	/* J14 pin3 - RLED */
-	NEW_PAD_CTRL(MX6PAD(GPIO_6__GPIO_1_6), WEAK),	/* J14 pins 8/9 (dry contact) - ALED */
-	NEW_PAD_CTRL(MX6PAD(GPIO_7__GPIO_1_7), WEAK),	/* J46 pins 2/3 (dry contact) - Lock */
-	NEW_PAD_CTRL(MX6PAD(GPIO_18__GPIO_7_13), WEAK),	/* J14 pin5 - VOL+ */
-	NEW_PAD_CTRL(MX6PAD(GPIO_19__GPIO_4_5), WEAK),	/* J14 pin7 - VOL- */
+	/* GPIOs connector (J46) */
+	NEW_PAD_CTRL(MX6PAD(GPIO_7__GPIO_1_7), WEAK),
+	NEW_PAD_CTRL(MX6PAD(GPIO_8__GPIO_1_8), WEAK),
+	NEW_PAD_CTRL(MX6PAD(GPIO_18__GPIO_7_13), WEAK),
+	NEW_PAD_CTRL(MX6PAD(GPIO_19__GPIO_4_5), WEAK),
+        NEW_PAD_CTRL(MX6PAD(EIM_D29__GPIO_3_29), WEAK),
 	0
 };