diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-10-22 11:38:46 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-10-22 11:38:46 -0700 |
| commit | 8196edb1d5c7254ebd7b537a8e19ff0aa29c0e44 (patch) | |
| tree | c765e319568b9d026c3dd002910ab0c4ed685a8c | |
| parent | 67dbcd572bcf0855dcf4a53cdcfd3e01acfd1064 (diff) | |
nit6xlite: set GPIO outputs low
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_nit6xlite.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/pads-mx6_nit6xlite.h | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/mach-mx6/board-mx6_nit6xlite.c b/arch/arm/mach-mx6/board-mx6_nit6xlite.c index 782636f4c1a1..6e11bf8d241b 100644 --- a/arch/arm/mach-mx6/board-mx6_nit6xlite.c +++ b/arch/arm/mach-mx6/board-mx6_nit6xlite.c @@ -110,9 +110,10 @@ #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_DRYCONTACT IMX_GPIO_NR(1, 6) /* J14 pins 8 and 9 - dry contact */ #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 */ @@ -173,9 +174,10 @@ struct gpio mx6_init_gpios[] __initdata = { {.label = "wl_clk_req_irq", .gpio = WL_CLK_REQ_IRQ, .flags = GPIOF_DIR_IN}, /* GPIO6[9]: NANDF_WP_B - active low */ {.label = "wl_wake_irq", .gpio = WL_WAKE_IRQ, .flags = GPIOF_DIR_IN}, /* GPIO6[14]: NANDF_CS1 - active low */ - {.label = "drycontact", .gpio = MX6_N6L_DRYCONTACT, .flags = GPIOF_HIGH}, /* J14 pins 8/9: GPIO6 */ - {.label = "gled", .gpio = MX6_N6L_GLED, .flags = GPIOF_HIGH}, /* J14 pin1: GPIO2 */ - {.label = "rled", .gpio = MX6_N6L_RLED, .flags = GPIOF_HIGH}, /* J14 pin3: GPIO3 */ + {.label = "gled", .gpio = MX6_N6L_GLED, .flags = 0}, /* J14 pin1: GPIO2 */ + {.label = "rled", .gpio = MX6_N6L_RLED, .flags = 0}, /* J14 pin3: GPIO3 */ + {.label = "drycontact", .gpio = MX6_N6L_DRYCONTACT, .flags = 0}, /* J14 pins 8/9: GPIO6 */ + {.label = "drycontact2", .gpio = MX6_N6L_DRYCONTACT2, .flags = 0}, /* J14 pins 8/9: GPIO6 */ {.label = "volup", .gpio = MX6_N6L_VOLUP, .flags = GPIOF_DIR_IN}, /* J14 pin5: GPIO_18 */ {.label = "voldown", .gpio = MX6_N6L_VOLDOWN, .flags = GPIOF_DIR_IN}, /* J14 pin7: GPIO_19 */ }; diff --git a/arch/arm/mach-mx6/pads-mx6_nit6xlite.h b/arch/arm/mach-mx6/pads-mx6_nit6xlite.h index 934e227aeb54..63dc0fb59e2b 100644 --- a/arch/arm/mach-mx6/pads-mx6_nit6xlite.h +++ b/arch/arm/mach-mx6/pads-mx6_nit6xlite.h @@ -183,9 +183,10 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = { MX6PAD(SD2_DAT3__USDHC2_DAT3), /* GPIO connector (J14) */ - MX6PAD(GPIO_6__GPIO_1_6), /* J14 pins 8/9 (dry contact) */ 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- */ 0 |