ARM: dts: imx6dl-colibri: Drop dedicated v1.1 device tree

Drop Colibri V1.1 device tree, this is just a duplicate of Colibri V1.0
with the possibility to use SD cards in UHS mode if the carrier board
does not have 3.3V pull up resistor.

The dedicated device tree kept the feature switched of by setting
the no-1-8-v property and thus does not offer anything different
than what the regular device tree does.

Thus drop the dedicated device tree and merge the preparation to
allow enabling the feature should a carrier without pull ups
be used into the regular device tree.

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

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 252353f..ae3cac8 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -459,7 +459,6 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6dl-aristainetos2_4.dtb \
        imx6dl-aristainetos2_7.dtb \
        imx6dl-colibri-eval-v3.dtb \
-       imx6dl-colibri-v1_1-eval-v3.dtb \
        imx6dl-cubox-i.dtb \
        imx6dl-cubox-i-emmc-som-v15.dtb \
        imx6dl-cubox-i-som-v15.dtb \

diff --git a/arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts
deleted file mode 100644 (file)
index 223275f..0000000
--- a/arch/arm/boot/dts/imx6dl-colibri-v1_1-eval-v3.dts
+++ /dev/null
@@ -1,31 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
-/*
- * Copyright 2020 Toradex
- */
-
-/dts-v1/;
-
-#include "imx6dl-colibri-eval-v3.dts"
-#include "imx6qdl-colibri-v1_1-uhs.dtsi"
-
-/ {
-       model = "Toradex Colibri iMX6DL/S V1.1 on Colibri Evaluation Board V3";
-       compatible = "toradex,colibri_imx6dl-v1_1-eval-v3",
-                    "toradex,colibri_imx6dl-v1_1",
-                    "toradex,colibri_imx6dl-eval-v3",
-                    "toradex,colibri_imx6dl",
-                    "fsl,imx6dl";
-};
-
-/* Colibri MMC */
-&usdhc1 {
-       status = "okay";
-       /*
-        * Please make sure your carrier board does not pull-up any of
-        * the MMC/SD signals to 3.3 volt before attempting to activate
-        * UHS-I support.
-        * To let signaling voltage be changed to 1.8V, please
-        * delete no-1-8-v property (example below):
-        * /delete-property/no-1-8-v;
-        */
-};

diff --git a/arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi b/arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi
deleted file mode 100644 (file)
index 7672fbf..0000000
--- a/arch/arm/boot/dts/imx6qdl-colibri-v1_1-uhs.dtsi
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
-/*
- * Copyright 2020 Toradex
- */
-
-&iomuxc {
-       pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
-               fsl,pins = <
-                       MX6QDL_PAD_SD1_CMD__SD1_CMD    0x170b1
-                       MX6QDL_PAD_SD1_CLK__SD1_CLK    0x100b1
-                       MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x170b1
-                       MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x170b1
-                       MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x170b1
-                       MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x170b1
-               >;
-       };
-
-       pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
-               fsl,pins = <
-                       MX6QDL_PAD_SD1_CMD__SD1_CMD    0x170f1
-                       MX6QDL_PAD_SD1_CLK__SD1_CLK    0x100f1
-                       MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x170f1
-                       MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x170f1
-                       MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x170f1
-                       MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x170f1
-               >;
-       };
-};
-
-/* Colibri MMC */
-&usdhc1 {
-       pinctrl-names = "default", "state_100mhz", "state_200mhz";
-       pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
-       pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_mmc_cd>;
-       pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_mmc_cd>;
-       vmmc-supply = <&reg_module_3v3>;
-       vqmmc-supply = <&vgen3_reg>;
-       wakeup-source;
-       keep-power-in-suspend;
-       sd-uhs-sdr12;
-       sd-uhs-sdr25;
-       sd-uhs-sdr50;
-       sd-uhs-sdr104;
-};

diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 4e2a309..16d38bc 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -370,11 +370,14 @@
 
 /* Colibri MMC */
 &usdhc1 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
        pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
+       pinctrl-1 = <&pinctrl_usdhc1_100mhz &pinctrl_mmc_cd>;
+       pinctrl-2 = <&pinctrl_usdhc1_200mhz &pinctrl_mmc_cd>;
        cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */
        disable-wp;
-       vqmmc-supply = <&reg_module_3v3>;
+       vmmc-supply = <&reg_module_3v3>;
+       vqmmc-supply = <&vgen3_reg>;
        bus-width = <4>;
        no-1-8-v;
        status = "disabled";
@@ -692,6 +695,28 @@
                >;
        };
 
+       pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
+               fsl,pins = <
+                       MX6QDL_PAD_SD1_CMD__SD1_CMD    0x170b1
+                       MX6QDL_PAD_SD1_CLK__SD1_CLK    0x100b1
+                       MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x170b1
+                       MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x170b1
+                       MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x170b1
+                       MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x170b1
+               >;
+       };
+
+       pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
+               fsl,pins = <
+                       MX6QDL_PAD_SD1_CMD__SD1_CMD    0x170f1
+                       MX6QDL_PAD_SD1_CLK__SD1_CLK    0x100f1
+                       MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x170f1
+                       MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x170f1
+                       MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x170f1
+                       MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x170f1
+               >;
+       };
+
        pinctrl_usdhc3: usdhc3grp {
                fsl,pins = <
                        MX6QDL_PAD_SD3_CMD__SD3_CMD     0x17059