ARM: dts: imx6sl: add pinctrl uhs states for usdhc

This is needed for SD3.0 cards working on UHS mode.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 36ea01e308d36571a57491f1cafec851a0c0cf9d..c14195f6c5f95a3960611e265ca93aedde1d2127 100644 (file)
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -89,8 +89,10 @@
 };
 
 &usdhc1 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
        pinctrl-0 = <&pinctrl_usdhc1_1>;
+       pinctrl-1 = <&pinctrl_usdhc1_1_100mhz>;
+       pinctrl-2 = <&pinctrl_usdhc1_1_200mhz>;
        bus-width = <8>;
        cd-gpios = <&gpio4 7 0>;
        wp-gpios = <&gpio4 6 0>;
@@ -98,16 +100,20 @@
 };
 
 &usdhc2 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
        pinctrl-0 = <&pinctrl_usdhc2_1>;
+       pinctrl-1 = <&pinctrl_usdhc2_1_100mhz>;
+       pinctrl-2 = <&pinctrl_usdhc2_1_200mhz>;
        cd-gpios = <&gpio5 0 0>;
        wp-gpios = <&gpio4 29 0>;
        status = "okay";
 };
 
 &usdhc3 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
        pinctrl-0 = <&pinctrl_usdhc3_1>;
+       pinctrl-1 = <&pinctrl_usdhc3_1_100mhz>;
+       pinctrl-2 = <&pinctrl_usdhc3_1_200mhz>;
        cd-gpios = <&gpio3 22 0>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index f295290d29fc904b8c70bf29ff3e5c3e8f2f2fe4..e4d6d1efb4579e15f3779e6edea6b4c383946e0b 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -639,6 +639,38 @@
                                                        MX6SL_PAD_SD1_DAT7__SD1_DATA7 0x17059
                                                >;
                                        };
+
+                                       pinctrl_usdhc1_1_100mhz: usdhc1grp-1-100mhz {
+                                               fsl,pins = <
+                                                       MX6SL_PAD_SD1_CMD__SD1_CMD 0x170b9
+                                                       MX6SL_PAD_SD1_CLK__SD1_CLK 0x100b9
+                                                       MX6SL_PAD_SD1_DAT0__SD1_DATA0 0x170b9
+                                                       MX6SL_PAD_SD1_DAT1__SD1_DATA1 0x170b9
+                                                       MX6SL_PAD_SD1_DAT2__SD1_DATA2 0x170b9
+                                                       MX6SL_PAD_SD1_DAT3__SD1_DATA3 0x170b9
+                                                       MX6SL_PAD_SD1_DAT4__SD1_DATA4 0x170b9
+                                                       MX6SL_PAD_SD1_DAT5__SD1_DATA5 0x170b9
+                                                       MX6SL_PAD_SD1_DAT6__SD1_DATA6 0x170b9
+                                                       MX6SL_PAD_SD1_DAT7__SD1_DATA7 0x170b9
+                                               >;
+                                       };
+
+                                       pinctrl_usdhc1_1_200mhz: usdhc1grp-1-200mhz {
+                                               fsl,pins = <
+                                                       MX6SL_PAD_SD1_CMD__SD1_CMD 0x170f9
+                                                       MX6SL_PAD_SD1_CLK__SD1_CLK 0x100f9
+                                                       MX6SL_PAD_SD1_DAT0__SD1_DATA0 0x170f9
+                                                       MX6SL_PAD_SD1_DAT1__SD1_DATA1 0x170f9
+                                                       MX6SL_PAD_SD1_DAT2__SD1_DATA2 0x170f9
+                                                       MX6SL_PAD_SD1_DAT3__SD1_DATA3 0x170f9
+                                                       MX6SL_PAD_SD1_DAT4__SD1_DATA4 0x170f9
+                                                       MX6SL_PAD_SD1_DAT5__SD1_DATA5 0x170f9
+                                                       MX6SL_PAD_SD1_DAT6__SD1_DATA6 0x170f9
+                                                       MX6SL_PAD_SD1_DAT7__SD1_DATA7 0x170f9
+                                               >;
+                                       };
+
+
                                };
 
                                usdhc2 {
@@ -652,6 +684,29 @@
                                                        MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x17059
                                                >;
                                        };
+
+                                       pinctrl_usdhc2_1_100mhz: usdhc2grp-1-100mhz {
+                                               fsl,pins = <
+                                                       MX6SL_PAD_SD2_CMD__SD2_CMD    0x170b9
+                                                       MX6SL_PAD_SD2_CLK__SD2_CLK    0x100b9
+                                                       MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x170b9
+                                                       MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x170b9
+                                                       MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x170b9
+                                                       MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x170b9
+                                               >;
+                                       };
+
+                                       pinctrl_usdhc2_1_200mhz: usdhc2grp-1-200mhz {
+                                               fsl,pins = <
+                                                       MX6SL_PAD_SD2_CMD__SD2_CMD    0x170f9
+                                                       MX6SL_PAD_SD2_CLK__SD2_CLK    0x100f9
+                                                       MX6SL_PAD_SD2_DAT0__SD2_DATA0 0x170f9
+                                                       MX6SL_PAD_SD2_DAT1__SD2_DATA1 0x170f9
+                                                       MX6SL_PAD_SD2_DAT2__SD2_DATA2 0x170f9
+                                                       MX6SL_PAD_SD2_DAT3__SD2_DATA3 0x170f9
+                                               >;
+                                       };
+
                                };
 
                                usdhc3 {
@@ -665,6 +720,28 @@
                                                        MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x17059
                                                >;
                                        };
+
+                                       pinctrl_usdhc3_1_100mhz: usdhc3grp-1-100mhz {
+                                               fsl,pins = <
+                                                       MX6SL_PAD_SD3_CMD__SD3_CMD    0x170b9
+                                                       MX6SL_PAD_SD3_CLK__SD3_CLK    0x100b9
+                                                       MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x170b9
+                                                       MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x170b9
+                                                       MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x170b9
+                                                       MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x170b9
+                                               >;
+                                       };
+
+                                       pinctrl_usdhc3_1_200mhz: usdhc3grp-1-200mhz {
+                                               fsl,pins = <
+                                                       MX6SL_PAD_SD3_CMD__SD3_CMD    0x170f9
+                                                       MX6SL_PAD_SD3_CLK__SD3_CLK    0x100f9
+                                                       MX6SL_PAD_SD3_DAT0__SD3_DATA0 0x170f9
+                                                       MX6SL_PAD_SD3_DAT1__SD3_DATA1 0x170f9
+                                                       MX6SL_PAD_SD3_DAT2__SD3_DATA2 0x170f9
+                                                       MX6SL_PAD_SD3_DAT3__SD3_DATA3 0x170f9
+                                               >;
+                                       };
                                };
                        };