ARM: dts: imx7-colibri: fix 1.8V/UHS support

Add pinmuxing and do not specify voltage restrictions for the usdhc
instance available on the modules edge connector. This allows to use
SD-cards with higher transfer modes if supported by the carrier board.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 8df8a2a..d05be3f 100644 (file)
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -322,7 +322,6 @@
 &usdhc1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>;
-       no-1-8-v;
        cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
        disable-wp;
        vqmmc-supply = <&reg_LDO2>;
@@ -667,6 +666,28 @@
                >;
        };
 
+       pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {
+               fsl,pins = <
+                       MX7D_PAD_SD1_CMD__SD1_CMD       0x5a
+                       MX7D_PAD_SD1_CLK__SD1_CLK       0x1a
+                       MX7D_PAD_SD1_DATA0__SD1_DATA0   0x5a
+                       MX7D_PAD_SD1_DATA1__SD1_DATA1   0x5a
+                       MX7D_PAD_SD1_DATA2__SD1_DATA2   0x5a
+                       MX7D_PAD_SD1_DATA3__SD1_DATA3   0x5a
+               >;
+       };
+
+       pinctrl_usdhc1_200mhz: usdhc1grp_200mhz {
+               fsl,pins = <
+                       MX7D_PAD_SD1_CMD__SD1_CMD       0x5b
+                       MX7D_PAD_SD1_CLK__SD1_CLK       0x1b
+                       MX7D_PAD_SD1_DATA0__SD1_DATA0   0x5b
+                       MX7D_PAD_SD1_DATA1__SD1_DATA1   0x5b
+                       MX7D_PAD_SD1_DATA2__SD1_DATA2   0x5b
+                       MX7D_PAD_SD1_DATA3__SD1_DATA3   0x5b
+               >;
+       };
+
        pinctrl_usdhc3: usdhc3grp {
                fsl,pins = <
                        MX7D_PAD_SD3_CMD__SD3_CMD               0x59