diff options
| author | Haibo Chen <haibo.chen@freescale.com> | 2015-06-05 16:04:02 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-09-17 09:23:30 -0500 |
| commit | 00cb181068e9a7c8f984045e7a030a7e6a50de6a (patch) | |
| tree | e8e4fc3f2e646eb0aff48c56165360bae367ceda /arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts | |
| parent | f6ff9917d541dbeeed91f2c91eecf5f9b903386a (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/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2-sai.dts | 12 |
1 files changed, 6 insertions, 6 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 { |