diff options
| author | Haibo Chen <haibo.chen@freescale.com> | 2015-06-05 16:04:02 +0800 |
|---|---|---|
| committer | Haibo Chen <haibo.chen@freescale.com> | 2015-06-05 16:32:25 +0800 |
| commit | 10762955b32f65e995344732bc16381c483ab7c8 (patch) | |
| tree | 42c685152e4a2e83a2bb2d6addce61916f003810 /arch | |
| parent | 8de6b09949cf2c6df24230f67fb9fa29795482da (diff) | |
MLK-11023-1 ARM: dts: imx7d-12x12-lpddr3-arm2-sai: fix sd issue
Audio has a pin conflict with sd2-vselect. This patch move sd2_vselect
to a new hog group pinctrl_hog_sd2_vselect. imx7d-12x12-lpddr3-arm2.dts
include this new hog group, for imx7d-12x12-lpddr3-arm2-sai.dts, do not
include this new hog group due to the pin conflict.
Due to the pin conflict, if support audio, sd2 slot can't support SD3.0
So this patch disable the SD3.0 for sd2 slot.
Signed-off-by: Haibo Chen <haibo.chen@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts index d2e90feec69e..0503cc2e0715 100644 --- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts +++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts @@ -21,12 +21,12 @@ }; }; -&pinctrl_hog_1{ - /* Pin conflict with SAI */ - fsl,pins = < - MX7D_PAD_GPIO1_IO12__GPIO1_IO12 0x59 - MX7D_PAD_GPIO1_IO13__GPIO1_IO13 0x59 - >; +&iomuxc { + pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog>; +}; + +&usdhc2 { + no-1-8-v; }; &sai1 { diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts index 97963378694b..473e68c207db 100644 --- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts +++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts @@ -252,7 +252,7 @@ &iomuxc { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog>; + pinctrl-0 = <&pinctrl_hog_1 &pinctrl_hog &pinctrl_hog_sd2_vselect>; hog { pinctrl_hog_1: hoggrp-1 { @@ -270,18 +270,24 @@ MX7D_PAD_SD2_CD_B__GPIO5_IO9 0x59 MX7D_PAD_SD2_WP__GPIO5_IO10 0x59 MX7D_PAD_SD2_RESET_B__GPIO5_IO11 0x59 - MX7D_PAD_GPIO1_IO12__SD2_VSELECT 0x59 MX7D_PAD_ECSPI1_SCLK__GPIO4_IO16 0x59 MX7D_PAD_ECSPI1_MOSI__GPIO4_IO17 0x59 >; }; + pinctrl_hog: hoggrp { fsl,pins = < MX7D_PAD_ECSPI1_MISO__GPIO4_IO18 0x80000000 /* pwr int */ MX7D_PAD_ECSPI1_MOSI__GPIO4_IO17 0x80000000 >; }; + + pinctrl_hog_sd2_vselect: hoggrp_sd2vselect { + fsl,pins = < + MX7D_PAD_GPIO1_IO12__SD2_VSELECT 0x59 + >; + }; }; lcdif { @@ -823,6 +829,8 @@ MX7D_PAD_SAI1_RX_SYNC__SAI1_RX_SYNC 0x1f MX7D_PAD_SAI1_RX_DATA__SAI1_RX_DATA0 0x1f MX7D_PAD_SAI1_TX_DATA__SAI1_TX_DATA0 0 + MX7D_PAD_GPIO1_IO12__GPIO1_IO12 0x59 + MX7D_PAD_GPIO1_IO13__GPIO1_IO13 0x59 >; }; }; |