diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-17 19:00:19 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-26 10:31:58 +0200 |
| commit | 8689b4b60c041cea4f07add4ba890f7c3c1896ed (patch) | |
| tree | 7364ba63ef1314b6580790a2794e5b643d6eff7c /arch/arm | |
| parent | 15540f62965934564640335afbc9e6004cf06b30 (diff) | |
arm: dts apalis-imx6: fix sd card support for ixora-v1.2
SD card is not detected on Ixora revision v1.2 board.
Add card detect gpio to SOM DTSI, clean-up carrier boards
Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/imx6q-apalis-eval.dts | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 21 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 3 |
4 files changed, 12 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index 3ac59ca1d061..b425d7a57209 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -253,9 +253,6 @@ /* MMC1 */ &usdhc1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; - cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts index ffa00e253e89..1382edb1d164 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -273,7 +273,6 @@ &usdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; - cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; bus-width = <4>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts index b087f051f3dc..5dc0d54f53b2 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts @@ -292,15 +292,13 @@ pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_mmc_cd>; pinctrl-1 = <&pinctrl_usdhc1_4bit_sleep &pinctrl_mmc_cd_sleep>; bus-width = <4>; - status = "okay"; cap-power-off-card; vmmc-supply = <®_3v3_vmmc>; + status = "okay"; }; &iomuxc { - /* - * Mux the Apalis GPIOs - */ + /* Mux the Apalis GPIOs */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2 &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4 @@ -342,19 +340,20 @@ pinctrl_mmc_cd_sleep: gpiommccdgrpslp { fsl,pins = < - /* MMC1 CD */ + /* MMC1 CD */ MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x0 >; }; pinctrl_usdhc1_4bit_sleep: usdhc1grp_4bit_sleep { fsl,pins = < - MX6QDL_PAD_SD1_CMD__SD1_CMD 0x3000 - MX6QDL_PAD_SD1_CLK__SD1_CLK 0x3000 - MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x3000 - MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x3000 - MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x3000 - MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x3000 + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x3000 + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x3000 + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x3000 + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x3000 + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x3000 + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x3000 >; }; + }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 44ae33c357a9..98d7b7174df0 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -1029,7 +1029,8 @@ /* MMC1 */ &usdhc1 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>; + pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit &pinctrl_mmc_cd>; + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>; vqmmc-supply = <®_module_3v3>; bus-width = <8>; disable-wp; |