diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-04-30 08:22:42 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-06-10 17:54:20 -0700 |
| commit | e910c3cd78b4960a9435cb8abd868135ae421591 (patch) | |
| tree | 9666cef5044abb40a041dba8dc8561b2d6b0c6b4 | |
| parent | 9eec52f41ca006e370629341e68ee13fe84cf086 (diff) | |
SABRE Lite/variants: implicitly set SD2 pads
| -rw-r--r-- | arch/arm/mach-mx6/pads-mx6_nit6xlite.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/pads-mx6_nitrogen6x.h | 9 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/pads-mx6_oc.h | 9 |
3 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/pads-mx6_nit6xlite.h b/arch/arm/mach-mx6/pads-mx6_nit6xlite.h index d86014039720..1eae09d538cc 100644 --- a/arch/arm/mach-mx6/pads-mx6_nit6xlite.h +++ b/arch/arm/mach-mx6/pads-mx6_nit6xlite.h @@ -168,6 +168,15 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = { NEW_PAD_CTRL(MX6PAD(EIM_D30__GPIO_3_30), WEAK), NEW_PAD_CTRL(MX6PAD(SD3_DAT4__GPIO_7_1), WEAK), + /* SDHC2 (WiFi) */ + /* USDHC2 */ + MX6PAD(SD2_CLK__USDHC2_CLK), + MX6PAD(SD2_CMD__USDHC2_CMD), + MX6PAD(SD2_DAT0__USDHC2_DAT0), + MX6PAD(SD2_DAT1__USDHC2_DAT1), + MX6PAD(SD2_DAT2__USDHC2_DAT2), + 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 */ diff --git a/arch/arm/mach-mx6/pads-mx6_nitrogen6x.h b/arch/arm/mach-mx6/pads-mx6_nitrogen6x.h index c049773534c2..ad36d697c4ee 100644 --- a/arch/arm/mach-mx6/pads-mx6_nitrogen6x.h +++ b/arch/arm/mach-mx6/pads-mx6_nitrogen6x.h @@ -302,6 +302,15 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = { MX6PAD(KEY_COL4__USBOH3_USBOTG_OC), MX6PAD(EIM_D30__USBOH3_USBH1_OC), + /* SDHC2 (WiFi) */ + /* USDHC2 */ + MX6PAD(SD2_CLK__USDHC2_CLK), + MX6PAD(SD2_CMD__USDHC2_CMD), + MX6PAD(SD2_DAT0__USDHC2_DAT0), + MX6PAD(SD2_DAT1__USDHC2_DAT1), + MX6PAD(SD2_DAT2__USDHC2_DAT2), + MX6PAD(SD2_DAT3__USDHC2_DAT3), + /* USDHC3 */ SD_PINS(3, USDHC_PAD_CTRL_50MHZ), MX6PAD(SD3_DAT5__GPIO_7_0), /* J18 - SD3_CD */ diff --git a/arch/arm/mach-mx6/pads-mx6_oc.h b/arch/arm/mach-mx6/pads-mx6_oc.h index 775a3ec075bd..b42b34983153 100644 --- a/arch/arm/mach-mx6/pads-mx6_oc.h +++ b/arch/arm/mach-mx6/pads-mx6_oc.h @@ -224,6 +224,15 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = { MX6PAD(GPIO_1__USBOTG_ID), NEW_PAD_CTRL(MX6PAD(SD3_DAT4__GPIO_7_1), WEAK), + /* SDHC2 (WiFi) */ + /* USDHC2 */ + MX6PAD(SD2_CLK__USDHC2_CLK), + MX6PAD(SD2_CMD__USDHC2_CMD), + MX6PAD(SD2_DAT0__USDHC2_DAT0), + MX6PAD(SD2_DAT1__USDHC2_DAT1), + MX6PAD(SD2_DAT2__USDHC2_DAT2), + MX6PAD(SD2_DAT3__USDHC2_DAT3), + /* eMMC pads that aren't configured by U-Boot*/ MX6PAD(SD4_DAT4__USDHC4_DAT4_200MHZ), MX6PAD(SD4_DAT5__USDHC4_DAT5_200MHZ), |