summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mx6
diff options
context:
space:
mode:
authorTony Lin <tony.lin@freescale.com>2011-07-12 11:04:35 +0800
committerJason Liu <r64343@freescale.com>2012-07-20 13:14:28 +0800
commit6265c198207bd26042a2bc62e3c2aaa5386427cf (patch)
tree4d03e908e2bac1e039c57106b3ab9f96bab1ccf1 /arch/arm/mach-mx6
parent57e36de548ff4f11e719cf3f61e9553f93652804 (diff)
ENGR00152547-01 [MX6Q]add SDHC3.0 support on uSDHC controller
enable uSDHC slot 3 in board file add parameter in platform data to indicate whether the slot supports 1.8 voltage add pinmux to support voltage switch between 1.8V and 3.3V Signed-off-by: Tony Lin <tony.lin@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx6')
-rw-r--r--arch/arm/mach-mx6/board-mx6q_sabreauto.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c
index 0baf7b466699..fbe4e9691c6c 100644
--- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c
+++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c
@@ -131,6 +131,8 @@ static iomux_v3_cfg_t mx6q_sabreauto_pads[] = {
MX6Q_PAD_SD3_DAT6__USDHC3_DAT6,
MX6Q_PAD_SD3_DAT7__USDHC3_DAT7,
MX6Q_PAD_SD3_RST__USDHC3_RST,
+ /* SD3 VSelect */
+ MX6Q_PAD_GPIO_18__USDHC3_VSELECT,
/* SD3_CD and SD3_WP */
MX6Q_PAD_NANDF_CS0__GPIO_6_11,
MX6Q_PAD_NANDF_CS1__GPIO_6_14,
@@ -198,6 +200,7 @@ static iomux_v3_cfg_t mx6q_sabreauto_pads[] = {
static const struct esdhc_platform_data mx6q_sabreauto_sd3_data __initconst = {
.cd_gpio = MX6Q_SABREAUTO_SD3_CD,
.wp_gpio = MX6Q_SABREAUTO_SD3_WP,
+ .support_18v = 1,
};
/* No card detect signal for SD4 */
@@ -492,6 +495,7 @@ static void __init mx6_board_init(void)
imx6q_init_fec();
imx6q_add_sdhci_usdhc_imx(3, &mx6q_sabreauto_sd4_data);
+ imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabreauto_sd3_data);
imx_add_viv_gpu("gc2000", &imx6_gc2000_data, &imx6q_gc2000_pdata);
imx_add_viv_gpu("gc355", &imx6_gc355_data, NULL);
imx_add_viv_gpu("gc320", &imx6_gc320_data, NULL);