summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2012-06-25 11:59:26 -0700
committerEric Nelson <eric.nelson@boundarydevices.com>2012-06-25 11:59:26 -0700
commitc552472907ef053122ee75cd713be1ab63bc43a8 (patch)
tree11d7fc7a943242919f3201ec9e97452fe683cd7f
parent0a0d9b56d0b99abc916246e87c147f2801257205 (diff)
i.MX6: nitrogen6x: set SD2 pads for SDIO if WiFi is enabled
-rw-r--r--arch/arm/mach-mx6/board-mx6q_sabrelite.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c
index f2cceb9ffd52..f8e21a10df42 100644
--- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c
+++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c
@@ -962,6 +962,10 @@ static void __init sabrelite_add_device_buttons(void)
static void __init sabrelite_add_device_buttons(void) {}
#endif
+static iomux_v3_cfg_t n6x_sd2_pads[] = {
+ MX6Q_USDHC_PAD_SETTING(2, 50),
+};
+
#ifdef CONFIG_WL12XX_PLATFORM_DATA
struct wl12xx_platform_data n6q_wlan_data __initdata = {
.irq = gpio_to_irq(N6_WL1271_WL_IRQ),
@@ -1187,6 +1191,8 @@ static void __init mx6_sabrelite_board_init(void)
isn6 = is_nitrogen6w();
if (isn6) {
+ mxc_iomux_v3_setup_multiple_pads(n6x_sd2_pads,
+ ARRAY_SIZE(n6x_sd2_pads));
mx6_sabrelite_audio_data.ext_port = 3;
mx6q_sabrelite_sd3_data.wp_gpio = -1 ;
}