diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-06-04 16:57:46 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-06-04 16:57:46 -0700 |
| commit | 1a8335a9ad5b31b54781a2c5ac1b3447798874d6 (patch) | |
| tree | 05738ff5a3fbb7e7626cb8ac0129156b52b7a4d9 /arch | |
| parent | d4d4673636c9fe8f21ecb1fb1547da784528b673 (diff) | |
nit6xlite: define dry-contact pin on GPIO1:6 (pad GPIO_6)
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_nit6xlite.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/pads-mx6_nit6xlite.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/board-mx6_nit6xlite.c b/arch/arm/mach-mx6/board-mx6_nit6xlite.c index 5ef64eb66e85..dd5b5d9b42f9 100644 --- a/arch/arm/mach-mx6/board-mx6_nit6xlite.c +++ b/arch/arm/mach-mx6/board-mx6_nit6xlite.c @@ -109,6 +109,7 @@ #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_VOLUP IMX_GPIO_NR(7, 13) /* J14 pin5: GPIO_18 */ @@ -172,6 +173,7 @@ 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 = "volup", .gpio = MX6_N6L_VOLUP, .flags = GPIOF_DIR_IN}, /* J14 pin5: GPIO_18 */ diff --git a/arch/arm/mach-mx6/pads-mx6_nit6xlite.h b/arch/arm/mach-mx6/pads-mx6_nit6xlite.h index 90cb27503392..d86014039720 100644 --- a/arch/arm/mach-mx6/pads-mx6_nit6xlite.h +++ b/arch/arm/mach-mx6/pads-mx6_nit6xlite.h @@ -169,6 +169,7 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = { NEW_PAD_CTRL(MX6PAD(SD3_DAT4__GPIO_7_1), WEAK), /* 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_18__GPIO_7_13), WEAK), /* J14 pin5 - VOL+ */ |