Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx6q-apalis: Clean-up sd card support

Configure SOM DTSI to 8-bit, card detect in the SoM dtsi as this is
the Apalis family default functionality.
Limit the interface to 4-bit only on the Ixora V1.1 carrier boards.

Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Denys Drozdov and committed by
Shawn Guo
6a115544 9560fc59

+2 -5
-3
arch/arm/boot/dts/imx6q-apalis-eval.dts
··· 158 158 159 159 /* MMC1 */ 160 160 &usdhc1 { 161 - pinctrl-names = "default"; 162 - pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; 163 - cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; 164 161 status = "okay"; 165 162 }; 166 163
-1
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
··· 175 175 &usdhc1 { 176 176 pinctrl-names = "default"; 177 177 pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; 178 - cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; 179 178 bus-width = <4>; 180 179 status = "okay"; 181 180 };
+2 -1
arch/arm/boot/dts/imx6qdl-apalis.dtsi
··· 832 832 /* MMC1 */ 833 833 &usdhc1 { 834 834 pinctrl-names = "default"; 835 - pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>; 835 + pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; 836 + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; 836 837 vqmmc-supply = <&reg_module_3v3>; 837 838 bus-width = <8>; 838 839 disable-wp;