summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2013-07-06 12:47:31 -0700
committerEric Nelson <eric.nelson@boundarydevices.com>2013-07-06 12:47:31 -0700
commitdf77ff19c7efdfe4554f6c1c9d722de137b34908 (patch)
tree7f9406090bb94e8c246da3c49f7c4caa609b5696
parent2745dd809bb6d13293ae785956485b51b1b29bf4 (diff)
board-mx6_s: add GPIOs
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
-rw-r--r--arch/arm/mach-mx6/board-mx6_s.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/board-mx6_s.c b/arch/arm/mach-mx6/board-mx6_s.c
index e66113db9bdf..51f3f5543ab0 100644
--- a/arch/arm/mach-mx6/board-mx6_s.c
+++ b/arch/arm/mach-mx6/board-mx6_s.c
@@ -150,6 +150,17 @@ struct gpio n6w_wl1271_gpios[] __initdata = {
{.label = "wl1271_wl_en", .gpio = N6_WL1271_WL_EN, .flags = 0},
};
+struct gpio gpios[] __initdata = {
+ {.label = "SPARE_GPIO", .gpio = IMX_GPIO_NR(2,22), .flags = GPIOF_DIR_IN},
+ {.label = "TEMP_ALARM", .gpio = IMX_GPIO_NR(2,21), .flags = GPIOF_DIR_IN},
+ {.label = "FAN_FAIL", .gpio = IMX_GPIO_NR(2,19), .flags = GPIOF_DIR_IN},
+ {.label = "AC_FAIL", .gpio = IMX_GPIO_NR(2,18), .flags = GPIOF_DIR_IN},
+ {.label = "GPO_2", .gpio = IMX_GPIO_NR(2,17), .flags = 0},
+ {.label = "GPO_1", .gpio = IMX_GPIO_NR(2,16), .flags = 0},
+ {.label = "BGPI_2", .gpio = IMX_GPIO_NR(6,6), .flags = GPIOF_DIR_IN},
+ {.label = "BGPI_1", .gpio = IMX_GPIO_NR(5,4), .flags = GPIOF_DIR_IN},
+};
+
__init static int is_nitrogen6w(void)
{
int ret = gpio_request_array(n6w_wl1271_gpios,
@@ -1226,6 +1237,7 @@ static void __init board_init(void)
imx6q_add_pcie(&pcie_data);
+ gpio_request_array(gpios,ARRAY_SIZE(gpios));
imx6q_add_perfmon(0);
imx6q_add_perfmon(1);
imx6q_add_perfmon(2);