]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ARM: dts: imx: imx6sl/qdl-pingrp: reorganize USDHCx pad groups
authorTroy Kisky <troy.kisky@boundarydevices.com>
Thu, 21 Nov 2013 05:35:22 +0000 (22:35 -0700)
committerShawn Guo <shawn.guo@linaro.org>
Tue, 31 Dec 2013 03:04:50 +0000 (11:04 +0800)
Use helper macros to avoid repetition.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
16 files changed:
arch/arm/boot/dts/imx6q-arm2.dts
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
arch/arm/boot/dts/imx6q-gw5400-a.dts
arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
arch/arm/boot/dts/imx6q-sabrelite.dts
arch/arm/boot/dts/imx6q-sbc6x.dts
arch/arm/boot/dts/imx6q-udoo.dts
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
arch/arm/boot/dts/imx6qdl-pingrp.h
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
arch/arm/boot/dts/imx6qdl-sabresd.dtsi
arch/arm/boot/dts/imx6qdl-wandboard.dtsi
arch/arm/boot/dts/imx6sl-evk.dts
arch/arm/boot/dts/imx6sl-pingrp.h

index ff922cc687d9602c20d4e1e1d0289193bc87767d..9c00b739dc3024371263c0195909647eff1369ae 100644 (file)
@@ -95,7 +95,7 @@
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP1>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
                };
 
                pinctrl_usdhc3_cdwp: usdhc3cdwp {
                };
 
                pinctrl_usdhc4: usdhc4grp {
-                       fsl,pins = <MX6QDL_USDHC4_PINGRP1>;
+                       fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
                };
        };
 };
index 5d6bab37162d1643ff5f604faa93f3c4d24e586d..84f51430fba7aa9ec94edfbb2d977725a3cdc20d 100644 (file)
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D4>;
                };
        };
 };
index 63c641def88f7f410f0eef4da9442fe9f2cbca6a..5f7634262a60e74e701de472a3f42fa4b9ddad26 100644 (file)
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D4>;
                };
        };
 };
index 0519903da67a1b7f28a3ed527576d78389546713..05b4796b1318d9b865cb60ca16114b7a92f05682 100644 (file)
                };
 
                pinctrl_usdhc2: usdhc2grp {
-                       fsl,pins = <MX6QDL_USDHC2_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC2_PINGRP_D4>;
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D4>;
                };
 
                pinctrl_usdhc3_cdwp: usdhc3cdwp {
index 75760edee8b0233b2bf034242eec4bda3cd5da92..fca8f22091466d204f2670081af858b04d3a477e 100644 (file)
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D4>;
                };
 
                pinctrl_usdhc4: usdhc4grp {
-                       fsl,pins = <MX6QDL_USDHC4_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC4_PINGRP_D4>;
                };
        };
 };
index 230977fc775566b64b72982a125a3fc280ca1de4..852675a489ac7899dafbc8b26b3fb9b19acc4a3f 100644 (file)
@@ -40,7 +40,7 @@
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D4>;
                };
        };
 };
index 1c7f7a108bcf561302a148a64bfe2ef891f37c75..47a5eda0770717c25eb7e742c787b49c34999cf2 100644 (file)
@@ -39,7 +39,7 @@
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D4>;
                };
        };
 };
index ffc1e66e0aa6c9613c770836f9c00c2cf074400c..a6c77b5453822b9abcd81c5567b568ec3da78e6d 100644 (file)
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D4>;
                };
        };
 };
index 79c2589624844e250807cd66297269dcfe1d0c25..35028a5bc00aed959286182fcda0c0c2a776ee0f 100644 (file)
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D4>;
                };
        };
 };
index cb112d3c813d35802aa7f791ee01032110d4effb..34b26b92d9bf11e70672ac34417bf23b533939ae 100644 (file)
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D4>;
                };
        };
 };
index d111e598cad16db3ac544d07619b48624d95fdac..8d71b13f7fc922aa95114fe0563f229a896ba308 100644 (file)
 #define MX6QDL_USBH3_PINGRP2 \
        MX6QDL_PAD_RGMII_RXC__USB_H3_STROBE             0x40017030
 
-#define MX6QDL_USDHC1_PINGRP1 \
-       MX6QDL_PAD_SD1_CMD__SD1_CMD                     0x17059 \
-       MX6QDL_PAD_SD1_CLK__SD1_CLK                     0x10059 \
-       MX6QDL_PAD_SD1_DAT0__SD1_DATA0                  0x17059 \
-       MX6QDL_PAD_SD1_DAT1__SD1_DATA1                  0x17059 \
-       MX6QDL_PAD_SD1_DAT2__SD1_DATA2                  0x17059 \
-       MX6QDL_PAD_SD1_DAT3__SD1_DATA3                  0x17059 \
-       MX6QDL_PAD_NANDF_D0__SD1_DATA4                  0x17059 \
-       MX6QDL_PAD_NANDF_D1__SD1_DATA5                  0x17059 \
-       MX6QDL_PAD_NANDF_D2__SD1_DATA6                  0x17059 \
-       MX6QDL_PAD_NANDF_D3__SD1_DATA7                  0x17059
-
-#define MX6QDL_USDHC1_PINGRP2 \
-       MX6QDL_PAD_SD1_CMD__SD1_CMD                     0x17059 \
-       MX6QDL_PAD_SD1_CLK__SD1_CLK                     0x10059 \
-       MX6QDL_PAD_SD1_DAT0__SD1_DATA0                  0x17059 \
-       MX6QDL_PAD_SD1_DAT1__SD1_DATA1                  0x17059 \
-       MX6QDL_PAD_SD1_DAT2__SD1_DATA2                  0x17059 \
-       MX6QDL_PAD_SD1_DAT3__SD1_DATA3                  0x17059
-
-#define MX6QDL_USDHC2_PINGRP1 \
-       MX6QDL_PAD_SD2_CMD__SD2_CMD                     0x17059 \
-       MX6QDL_PAD_SD2_CLK__SD2_CLK                     0x10059 \
-       MX6QDL_PAD_SD2_DAT0__SD2_DATA0                  0x17059 \
-       MX6QDL_PAD_SD2_DAT1__SD2_DATA1                  0x17059 \
-       MX6QDL_PAD_SD2_DAT2__SD2_DATA2                  0x17059 \
-       MX6QDL_PAD_SD2_DAT3__SD2_DATA3                  0x17059 \
-       MX6QDL_PAD_NANDF_D4__SD2_DATA4                  0x17059 \
-       MX6QDL_PAD_NANDF_D5__SD2_DATA5                  0x17059 \
-       MX6QDL_PAD_NANDF_D6__SD2_DATA6                  0x17059 \
-       MX6QDL_PAD_NANDF_D7__SD2_DATA7                  0x17059
-
-#define MX6QDL_USDHC2_PINGRP2 \
-       MX6QDL_PAD_SD2_CMD__SD2_CMD                     0x17059 \
-       MX6QDL_PAD_SD2_CLK__SD2_CLK                     0x10059 \
-       MX6QDL_PAD_SD2_DAT0__SD2_DATA0                  0x17059 \
-       MX6QDL_PAD_SD2_DAT1__SD2_DATA1                  0x17059 \
-       MX6QDL_PAD_SD2_DAT2__SD2_DATA2                  0x17059 \
-       MX6QDL_PAD_SD2_DAT3__SD2_DATA3                  0x17059
-
-#define MX6QDL_USDHC3_PINGRP1 \
-       MX6QDL_PAD_SD3_CMD__SD3_CMD                     0x17059 \
-       MX6QDL_PAD_SD3_CLK__SD3_CLK                     0x10059 \
-       MX6QDL_PAD_SD3_DAT0__SD3_DATA0                  0x17059 \
-       MX6QDL_PAD_SD3_DAT1__SD3_DATA1                  0x17059 \
-       MX6QDL_PAD_SD3_DAT2__SD3_DATA2                  0x17059 \
-       MX6QDL_PAD_SD3_DAT3__SD3_DATA3                  0x17059 \
-       MX6QDL_PAD_SD3_DAT4__SD3_DATA4                  0x17059 \
-       MX6QDL_PAD_SD3_DAT5__SD3_DATA5                  0x17059 \
-       MX6QDL_PAD_SD3_DAT6__SD3_DATA6                  0x17059 \
-       MX6QDL_PAD_SD3_DAT7__SD3_DATA7                  0x17059
-
-#define MX6QDL_USDHC3_PINGRP1_100MHZ \
-       MX6QDL_PAD_SD3_CMD__SD3_CMD                     0x170b9 \
-       MX6QDL_PAD_SD3_CLK__SD3_CLK                     0x100b9 \
-       MX6QDL_PAD_SD3_DAT0__SD3_DATA0                  0x170b9 \
-       MX6QDL_PAD_SD3_DAT1__SD3_DATA1                  0x170b9 \
-       MX6QDL_PAD_SD3_DAT2__SD3_DATA2                  0x170b9 \
-       MX6QDL_PAD_SD3_DAT3__SD3_DATA3                  0x170b9 \
-       MX6QDL_PAD_SD3_DAT4__SD3_DATA4                  0x170b9 \
-       MX6QDL_PAD_SD3_DAT5__SD3_DATA5                  0x170b9 \
-       MX6QDL_PAD_SD3_DAT6__SD3_DATA6                  0x170b9 \
-       MX6QDL_PAD_SD3_DAT7__SD3_DATA7                  0x170b9
-
-#define MX6QDL_USDHC3_PINGRP1_200MHZ \
-       MX6QDL_PAD_SD3_CMD__SD3_CMD                     0x170f9 \
-       MX6QDL_PAD_SD3_CLK__SD3_CLK                     0x100f9 \
-       MX6QDL_PAD_SD3_DAT0__SD3_DATA0                  0x170f9 \
-       MX6QDL_PAD_SD3_DAT1__SD3_DATA1                  0x170f9 \
-       MX6QDL_PAD_SD3_DAT2__SD3_DATA2                  0x170f9 \
-       MX6QDL_PAD_SD3_DAT3__SD3_DATA3                  0x170f9 \
-       MX6QDL_PAD_SD3_DAT4__SD3_DATA4                  0x170f9 \
-       MX6QDL_PAD_SD3_DAT5__SD3_DATA5                  0x170f9 \
-       MX6QDL_PAD_SD3_DAT6__SD3_DATA6                  0x170f9 \
-       MX6QDL_PAD_SD3_DAT7__SD3_DATA7                  0x170f9
-
-#define MX6QDL_USDHC3_PINGRP2 \
-       MX6QDL_PAD_SD3_CMD__SD3_CMD                     0x17059 \
-       MX6QDL_PAD_SD3_CLK__SD3_CLK                     0x10059 \
-       MX6QDL_PAD_SD3_DAT0__SD3_DATA0                  0x17059 \
-       MX6QDL_PAD_SD3_DAT1__SD3_DATA1                  0x17059 \
-       MX6QDL_PAD_SD3_DAT2__SD3_DATA2                  0x17059 \
-       MX6QDL_PAD_SD3_DAT3__SD3_DATA3                  0x17059
-
-#define MX6QDL_USDHC4_PINGRP1 \
-       MX6QDL_PAD_SD4_CMD__SD4_CMD                     0x17059 \
-       MX6QDL_PAD_SD4_CLK__SD4_CLK                     0x10059 \
-       MX6QDL_PAD_SD4_DAT0__SD4_DATA0                  0x17059 \
-       MX6QDL_PAD_SD4_DAT1__SD4_DATA1                  0x17059 \
-       MX6QDL_PAD_SD4_DAT2__SD4_DATA2                  0x17059 \
-       MX6QDL_PAD_SD4_DAT3__SD4_DATA3                  0x17059 \
-       MX6QDL_PAD_SD4_DAT4__SD4_DATA4                  0x17059 \
-       MX6QDL_PAD_SD4_DAT5__SD4_DATA5                  0x17059 \
-       MX6QDL_PAD_SD4_DAT6__SD4_DATA6                  0x17059 \
-       MX6QDL_PAD_SD4_DAT7__SD4_DATA7                  0x17059
-
-#define MX6QDL_USDHC4_PINGRP2 \
-       MX6QDL_PAD_SD4_CMD__SD4_CMD                     0x17059 \
-       MX6QDL_PAD_SD4_CLK__SD4_CLK                     0x10059 \
-       MX6QDL_PAD_SD4_DAT0__SD4_DATA0                  0x17059 \
-       MX6QDL_PAD_SD4_DAT1__SD4_DATA1                  0x17059 \
-       MX6QDL_PAD_SD4_DAT2__SD4_DATA2                  0x17059 \
-       MX6QDL_PAD_SD4_DAT3__SD4_DATA3                  0x17059
+#define MX6QDL_USDHC1_D4(pad, pad_data3, pad_clk)      \
+       MX6QDL_PAD_SD1_CMD__SD1_CMD                     pad \
+       MX6QDL_PAD_SD1_CLK__SD1_CLK                     pad_clk \
+       MX6QDL_PAD_SD1_DAT0__SD1_DATA0                  pad \
+       MX6QDL_PAD_SD1_DAT1__SD1_DATA1                  pad \
+       MX6QDL_PAD_SD1_DAT2__SD1_DATA2                  pad \
+       MX6QDL_PAD_SD1_DAT3__SD1_DATA3                  pad_data3
+
+#define MX6QDL_USDHC1_D8(pad, pad_data3, pad_clk)      \
+       MX6QDL_USDHC1_D4(pad, pad_data3, pad_clk)       \
+       MX6QDL_PAD_NANDF_D0__SD1_DATA4                  pad \
+       MX6QDL_PAD_NANDF_D1__SD1_DATA5                  pad \
+       MX6QDL_PAD_NANDF_D2__SD1_DATA6                  pad \
+       MX6QDL_PAD_NANDF_D3__SD1_DATA7                  pad
+
+#define MX6QDL_USDHC2_D4(pad, pad_data3, pad_clk)      \
+       MX6QDL_PAD_SD2_CMD__SD2_CMD                     pad \
+       MX6QDL_PAD_SD2_CLK__SD2_CLK                     pad_clk \
+       MX6QDL_PAD_SD2_DAT0__SD2_DATA0                  pad \
+       MX6QDL_PAD_SD2_DAT1__SD2_DATA1                  pad \
+       MX6QDL_PAD_SD2_DAT2__SD2_DATA2                  pad \
+       MX6QDL_PAD_SD2_DAT3__SD2_DATA3                  pad_data3
+
+#define MX6QDL_USDHC2_D8(pad, pad_data3, pad_clk)      \
+       MX6QDL_USDHC2_D4(pad, pad_data3, pad_clk)       \
+       MX6QDL_PAD_NANDF_D4__SD2_DATA4                  pad \
+       MX6QDL_PAD_NANDF_D5__SD2_DATA5                  pad \
+       MX6QDL_PAD_NANDF_D6__SD2_DATA6                  pad \
+       MX6QDL_PAD_NANDF_D7__SD2_DATA7                  pad
+
+#define MX6QDL_USDHC3_D4(pad, pad_data3, pad_clk)      \
+       MX6QDL_PAD_SD3_CMD__SD3_CMD                     pad \
+       MX6QDL_PAD_SD3_CLK__SD3_CLK                     pad_clk \
+       MX6QDL_PAD_SD3_DAT0__SD3_DATA0                  pad \
+       MX6QDL_PAD_SD3_DAT1__SD3_DATA1                  pad \
+       MX6QDL_PAD_SD3_DAT2__SD3_DATA2                  pad \
+       MX6QDL_PAD_SD3_DAT3__SD3_DATA3                  pad_data3
+
+#define MX6QDL_USDHC3_D8(pad, pad_data3, pad_clk)      \
+       MX6QDL_USDHC3_D4(pad, pad_data3, pad_clk)       \
+       MX6QDL_PAD_SD3_DAT4__SD3_DATA4                  pad \
+       MX6QDL_PAD_SD3_DAT5__SD3_DATA5                  pad \
+       MX6QDL_PAD_SD3_DAT6__SD3_DATA6                  pad \
+       MX6QDL_PAD_SD3_DAT7__SD3_DATA7                  pad
+
+#define MX6QDL_USDHC4_D4(pad, pad_data3, pad_clk)      \
+       MX6QDL_PAD_SD4_CMD__SD4_CMD                     pad \
+       MX6QDL_PAD_SD4_CLK__SD4_CLK                     pad_clk \
+       MX6QDL_PAD_SD4_DAT0__SD4_DATA0                  pad \
+       MX6QDL_PAD_SD4_DAT1__SD4_DATA1                  pad \
+       MX6QDL_PAD_SD4_DAT2__SD4_DATA2                  pad \
+       MX6QDL_PAD_SD4_DAT3__SD4_DATA3                  pad_data3
+
+#define MX6QDL_USDHC4_D8(pad, pad_data3, pad_clk)      \
+       MX6QDL_USDHC4_D4(pad, pad_data3, pad_clk)       \
+       MX6QDL_PAD_SD4_DAT4__SD4_DATA4                  pad \
+       MX6QDL_PAD_SD4_DAT5__SD4_DATA5                  pad \
+       MX6QDL_PAD_SD4_DAT6__SD4_DATA6                  pad \
+       MX6QDL_PAD_SD4_DAT7__SD4_DATA7                  pad
+
+#define MX6QDL_USDHC1_PINGRP_D4               MX6QDL_USDHC1_D4(0x17059,0x17059,0x10059)
+#define MX6QDL_USDHC1_PINGRP_D4_100MHZ MX6QDL_USDHC1_D4(0x170b9,0x170b9,0x100b9)
+#define MX6QDL_USDHC1_PINGRP_D4_200MHZ MX6QDL_USDHC1_D4(0x170f9,0x170f9,0x100f9)
+#define MX6QDL_USDHC1_PINGRP_D8               MX6QDL_USDHC1_D8(0x17059,0x17059,0x10059)
+#define MX6QDL_USDHC1_PINGRP_D8_100MHZ MX6QDL_USDHC1_D8(0x170b9,0x170b9,0x100b9)
+#define MX6QDL_USDHC1_PINGRP_D8_200MHZ MX6QDL_USDHC1_D8(0x170f9,0x170f9,0x100f9)
+
+#define MX6QDL_USDHC2_PINGRP_D4               MX6QDL_USDHC2_D4(0x17059,0x17059,0x10059)
+#define MX6QDL_USDHC2_PINGRP_D4_100MHZ MX6QDL_USDHC2_D4(0x170b9,0x170b9,0x100b9)
+#define MX6QDL_USDHC2_PINGRP_D4_200MHZ MX6QDL_USDHC2_D4(0x170f9,0x170f9,0x100f9)
+#define MX6QDL_USDHC2_PINGRP_D8               MX6QDL_USDHC2_D8(0x17059,0x17059,0x10059)
+#define MX6QDL_USDHC2_PINGRP_D8_100MHZ MX6QDL_USDHC2_D8(0x170b9,0x170b9,0x100b9)
+#define MX6QDL_USDHC2_PINGRP_D8_200MHZ MX6QDL_USDHC2_D8(0x170f9,0x170f9,0x100f9)
+
+#define MX6QDL_USDHC3_PINGRP_D4               MX6QDL_USDHC3_D4(0x17059,0x17059,0x10059)
+#define MX6QDL_USDHC3_PINGRP_D4_100MHZ MX6QDL_USDHC3_D4(0x170b9,0x170b9,0x100b9)
+#define MX6QDL_USDHC3_PINGRP_D4_200MHZ MX6QDL_USDHC3_D4(0x170f9,0x170f9,0x100f9)
+#define MX6QDL_USDHC3_PINGRP_D8               MX6QDL_USDHC3_D8(0x17059,0x17059,0x10059)
+#define MX6QDL_USDHC3_PINGRP_D8_100MHZ MX6QDL_USDHC3_D8(0x170b9,0x170b9,0x100b9)
+#define MX6QDL_USDHC3_PINGRP_D8_200MHZ MX6QDL_USDHC3_D8(0x170f9,0x170f9,0x100f9)
+
+#define MX6QDL_USDHC4_PINGRP_D4               MX6QDL_USDHC4_D4(0x17059,0x17059,0x10059)
+#define MX6QDL_USDHC4_PINGRP_D4_100MHZ MX6QDL_USDHC4_D4(0x170b9,0x170b9,0x100b9)
+#define MX6QDL_USDHC4_PINGRP_D4_200MHZ MX6QDL_USDHC4_D4(0x170f9,0x170f9,0x100f9)
+#define MX6QDL_USDHC4_PINGRP_D8               MX6QDL_USDHC4_D8(0x17059,0x17059,0x10059)
+#define MX6QDL_USDHC4_PINGRP_D8_100MHZ MX6QDL_USDHC4_D8(0x170b9,0x170b9,0x100b9)
+#define MX6QDL_USDHC4_PINGRP_D8_200MHZ MX6QDL_USDHC4_D8(0x170f9,0x170f9,0x100f9)
 
 #define MX6QDL_WEIM_CS0_PINGRP1 \
        MX6QDL_PAD_EIM_CS0__EIM_CS0_B                   0xb0b1
index 719c3a728e7e5e81afa0c1b67b7db107cb670835..a526796fdaacc6ecf6ebfe03342cf9f81a00acbe 100644 (file)
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP1>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
                };
 
                pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP1_100MHZ>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D8_100MHZ>;
                };
 
                pinctrl_usdhc3_200mhz: usdhc3grp200mhz {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP1_200MHZ>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D8_200MHZ>;
                };
 
                pinctrl_weim_cs0: weimcs0grp {
index 4239ef9ec0e4a32b9edbf703ac197a7ce981812c..570767f8c8313c74ce4a163848c1988e1d2e65aa 100644 (file)
                };
 
                pinctrl_usdhc2: usdhc2grp {
-                       fsl,pins = <MX6QDL_USDHC2_PINGRP1>;
+                       fsl,pins = <MX6QDL_USDHC2_PINGRP_D8>;
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP1>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D8>;
                };
        };
 };
index 10ed94a2cfeceab9cf91291245a5d7b1c24adc20..88894b13ccd23e96702b27501c012a8f3aa1921a 100644 (file)
                };
 
                pinctrl_usdhc1: usdhc1grp {
-                       fsl,pins = <MX6QDL_USDHC1_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC1_PINGRP_D4>;
                };
 
                pinctrl_usdhc2: usdhc2grp {
-                       fsl,pins = <MX6QDL_USDHC2_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC2_PINGRP_D4>;
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6QDL_USDHC3_PINGRP2>;
+                       fsl,pins = <MX6QDL_USDHC3_PINGRP_D4>;
                };
        };
 };
index e565989c44e2cb0b724835a5b998d08e6ff3dd87..f5e4513ebfc3be074263d633cba08b04fba428af 100644 (file)
                };
 
                pinctrl_usdhc1: usdhc1grp {
-                       fsl,pins = <MX6SL_USDHC1_PINGRP1>;
+                       fsl,pins = <MX6SL_USDHC1_PINGRP_D8>;
                };
 
                pinctrl_usdhc1_100mhz: usdhc1grp100mhz {
-                       fsl,pins = <MX6SL_USDHC1_PINGRP1_100MHZ>;
+                       fsl,pins = <MX6SL_USDHC1_PINGRP_D8_100MHZ>;
                };
 
                pinctrl_usdhc1_200mhz: usdhc1grp200mhz {
-                       fsl,pins = <MX6SL_USDHC1_PINGRP1_200MHZ>;
+                       fsl,pins = <MX6SL_USDHC1_PINGRP_D8_200MHZ>;
                };
 
                pinctrl_usdhc2: usdhc2grp {
-                       fsl,pins = <MX6SL_USDHC2_PINGRP1>;
+                       fsl,pins = <MX6SL_USDHC2_PINGRP_D4>;
                };
 
                pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
-                       fsl,pins = <MX6SL_USDHC2_PINGRP1_100MHZ>;
+                       fsl,pins = <MX6SL_USDHC2_PINGRP_D4_100MHZ>;
                };
 
                pinctrl_usdhc2_200mhz: usdhc2grp200mhz {
-                       fsl,pins = <MX6SL_USDHC2_PINGRP1_200MHZ>;
+                       fsl,pins = <MX6SL_USDHC2_PINGRP_D4_200MHZ>;
                };
 
                pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <MX6SL_USDHC3_PINGRP1>;
+                       fsl,pins = <MX6SL_USDHC3_PINGRP_D4>;
                };
 
                pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
-                       fsl,pins = <MX6SL_USDHC3_PINGRP1_100MHZ>;
+                       fsl,pins = <MX6SL_USDHC3_PINGRP_D4_100MHZ>;
                };
 
                pinctrl_usdhc3_200mhz: usdhc3grp200mhz {
-                       fsl,pins = <MX6SL_USDHC3_PINGRP1_200MHZ>;
+                       fsl,pins = <MX6SL_USDHC3_PINGRP_D4_200MHZ>;
                };
        };
 };
index 984077ba87c3e6c771a79847c177aaff0b14899c..ead26d402cc9111cbc424b9c361fd4b1b410d907 100644 (file)
 #define MX6SL_USBOTG2_PINGRP4 \
        MX6SL_PAD_SD3_DAT2__USB_OTG2_OC                 0x17059
 
-#define MX6SL_USDHC1_PINGRP1 \
-       MX6SL_PAD_SD1_CMD__SD1_CMD                      0x17059 \
-       MX6SL_PAD_SD1_CLK__SD1_CLK                      0x10059 \
-       MX6SL_PAD_SD1_DAT0__SD1_DATA0                   0x17059 \
-       MX6SL_PAD_SD1_DAT1__SD1_DATA1                   0x17059 \
-       MX6SL_PAD_SD1_DAT2__SD1_DATA2                   0x17059 \
-       MX6SL_PAD_SD1_DAT3__SD1_DATA3                   0x17059 \
-       MX6SL_PAD_SD1_DAT4__SD1_DATA4                   0x17059 \
-       MX6SL_PAD_SD1_DAT5__SD1_DATA5                   0x17059 \
-       MX6SL_PAD_SD1_DAT6__SD1_DATA6                   0x17059 \
-       MX6SL_PAD_SD1_DAT7__SD1_DATA7                   0x17059
-
-#define MX6SL_USDHC1_PINGRP1_100MHZ \
-       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
-
-#define MX6SL_USDHC1_PINGRP1_200MHZ \
-       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
-
-#define MX6SL_USDHC2_PINGRP1 \
-       MX6SL_PAD_SD2_CMD__SD2_CMD                      0x17059 \
-       MX6SL_PAD_SD2_CLK__SD2_CLK                      0x10059 \
-       MX6SL_PAD_SD2_DAT0__SD2_DATA0                   0x17059 \
-       MX6SL_PAD_SD2_DAT1__SD2_DATA1                   0x17059 \
-       MX6SL_PAD_SD2_DAT2__SD2_DATA2                   0x17059 \
-       MX6SL_PAD_SD2_DAT3__SD2_DATA3                   0x17059
-
-#define MX6SL_USDHC2_PINGRP1_100MHZ \
-       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
-
-#define MX6SL_USDHC2_PINGRP1_200MHZ \
-       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
-
-#define MX6SL_USDHC3_PINGRP1 \
-       MX6SL_PAD_SD3_CMD__SD3_CMD                      0x17059 \
-       MX6SL_PAD_SD3_CLK__SD3_CLK                      0x10059 \
-       MX6SL_PAD_SD3_DAT0__SD3_DATA0                   0x17059 \
-       MX6SL_PAD_SD3_DAT1__SD3_DATA1                   0x17059 \
-       MX6SL_PAD_SD3_DAT2__SD3_DATA2                   0x17059 \
-       MX6SL_PAD_SD3_DAT3__SD3_DATA3                   0x17059
-
-#define MX6SL_USDHC3_PINGRP1_100MHZ \
-       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
-
-#define MX6SL_USDHC3_PINGRP1_200MHZ \
-       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
+#define MX6SL_USDHC1_D4(pad, pad_data3, pad_clk)       \
+       MX6SL_PAD_SD1_CMD__SD1_CMD                      pad \
+       MX6SL_PAD_SD1_CLK__SD1_CLK                      pad_clk \
+       MX6SL_PAD_SD1_DAT0__SD1_DATA0                   pad \
+       MX6SL_PAD_SD1_DAT1__SD1_DATA1                   pad \
+       MX6SL_PAD_SD1_DAT2__SD1_DATA2                   pad \
+       MX6SL_PAD_SD1_DAT3__SD1_DATA3                   pad_data3
+
+#define MX6SL_USDHC1_D8(pad, pad_data3, pad_clk)       \
+       MX6SL_USDHC1_D4(pad, pad_data3, pad_clk)        \
+       MX6SL_PAD_SD1_DAT4__SD1_DATA4                   pad \
+       MX6SL_PAD_SD1_DAT5__SD1_DATA5                   pad \
+       MX6SL_PAD_SD1_DAT6__SD1_DATA6                   pad \
+       MX6SL_PAD_SD1_DAT7__SD1_DATA7                   pad
+
+#define MX6SL_USDHC2_D4(pad, pad_data3, pad_clk)       \
+       MX6SL_PAD_SD2_CMD__SD2_CMD                      pad \
+       MX6SL_PAD_SD2_CLK__SD2_CLK                      pad_clk \
+       MX6SL_PAD_SD2_DAT0__SD2_DATA0                   pad \
+       MX6SL_PAD_SD2_DAT1__SD2_DATA1                   pad \
+       MX6SL_PAD_SD2_DAT2__SD2_DATA2                   pad \
+       MX6SL_PAD_SD2_DAT3__SD2_DATA3                   pad_data3
+
+#define MX6SL_USDHC2_D8(pad, pad_data3, pad_clk)       \
+       MX6SL_USDHC2_D4(pad, pad_data3, pad_clk)        \
+       MX6SL_PAD_SD2_DAT4__SD2_DATA4                   pad \
+       MX6SL_PAD_SD2_DAT5__SD2_DATA5                   pad \
+       MX6SL_PAD_SD2_DAT6__SD2_DATA6                   pad \
+       MX6SL_PAD_SD2_DAT7__SD2_DATA7                   pad
+
+#define MX6SL_USDHC3_D4(pad, pad_data3, pad_clk)       \
+       MX6SL_PAD_SD3_CMD__SD3_CMD                      pad \
+       MX6SL_PAD_SD3_CLK__SD3_CLK                      pad_clk \
+       MX6SL_PAD_SD3_DAT0__SD3_DATA0                   pad \
+       MX6SL_PAD_SD3_DAT1__SD3_DATA1                   pad \
+       MX6SL_PAD_SD3_DAT2__SD3_DATA2                   pad \
+       MX6SL_PAD_SD3_DAT3__SD3_DATA3                   pad_data3
+
+#define MX6SL_USDHC3_D8(pad, pad_data3, pad_clk)       \
+       MX6SL_USDHC3_D4(pad, pad_data3, pad_clk)        \
+       MX6SL_PAD_SD2_DAT4__SD3_DATA4                   pad \
+       MX6SL_PAD_SD2_DAT5__SD3_DATA5                   pad \
+       MX6SL_PAD_SD2_DAT6__SD3_DATA6                   pad \
+       MX6SL_PAD_SD2_DAT7__SD3_DATA7                   pad
+
+#define MX6SL_USDHC4_D4(pad, pad_data3, pad_clk)       \
+       MX6SL_PAD_EPDC_BDR1__SD4_CMD                    pad \
+       MX6SL_PAD_EPDC_BDR0__SD4_CLK                    pad_clk \
+       MX6SL_PAD_EPDC_PWRCOM__SD4_DATA0                pad \
+       MX6SL_PAD_EPDC_PWRINT__SD4_DATA1                pad \
+       MX6SL_PAD_EPDC_PWRSTAT__SD4_DATA2               pad \
+       MX6SL_PAD_EPDC_PWRWAKEUP__SD4_DATA3             pad_data3
+
+#define MX6SL_USDHC4_D8(pad, pad_data3, pad_clk)       \
+       MX6SL_USDHC4_D4(pad, pad_data3, pad_clk)        \
+       MX6SL_PAD_KEY_COL7__SD4_DATA4                   pad \
+       MX6SL_PAD_KEY_ROW7__SD4_DATA5                   pad \
+       MX6SL_PAD_KEY_COL3__SD4_DATA6                   pad \
+       MX6SL_PAD_KEY_ROW3__SD4_DATA7                   pad
+
+#define MX6SL_USDHC1_PINGRP_D4       MX6SL_USDHC1_D4(0x17059, 0x17059, 0x10059)
+#define MX6SL_USDHC1_PINGRP_D4_100MHZ MX6SL_USDHC1_D4(0x170b9, 0x170b9, 0x100b9)
+#define MX6SL_USDHC1_PINGRP_D4_200MHZ MX6SL_USDHC1_D4(0x170f9, 0x170f9, 0x100f9)
+#define MX6SL_USDHC1_PINGRP_D8       MX6SL_USDHC1_D8(0x17059, 0x17059, 0x10059)
+#define MX6SL_USDHC1_PINGRP_D8_100MHZ MX6SL_USDHC1_D8(0x170b9, 0x170b9, 0x100b9)
+#define MX6SL_USDHC1_PINGRP_D8_200MHZ MX6SL_USDHC1_D8(0x170f9, 0x170f9, 0x100f9)
+
+#define MX6SL_USDHC2_PINGRP_D4       MX6SL_USDHC2_D4(0x17059, 0x17059, 0x10059)
+#define MX6SL_USDHC2_PINGRP_D4_100MHZ MX6SL_USDHC2_D4(0x170b9, 0x170b9, 0x100b9)
+#define MX6SL_USDHC2_PINGRP_D4_200MHZ MX6SL_USDHC2_D4(0x170f9, 0x170f9, 0x100f9)
+#define MX6SL_USDHC2_PINGRP_D8       MX6SL_USDHC2_D8(0x17059, 0x17059, 0x10059)
+#define MX6SL_USDHC2_PINGRP_D8_100MHZ MX6SL_USDHC2_D8(0x170b9, 0x170b9, 0x100b9)
+#define MX6SL_USDHC2_PINGRP_D8_200MHZ MX6SL_USDHC2_D8(0x170f9, 0x170f9, 0x100f9)
+
+#define MX6SL_USDHC3_PINGRP_D4       MX6SL_USDHC3_D4(0x17059, 0x17059, 0x10059)
+#define MX6SL_USDHC3_PINGRP_D4_100MHZ MX6SL_USDHC3_D4(0x170b9, 0x170b9, 0x100b9)
+#define MX6SL_USDHC3_PINGRP_D4_200MHZ MX6SL_USDHC3_D4(0x170f9, 0x170f9, 0x100f9)
+#define MX6SL_USDHC3_PINGRP_D8       MX6SL_USDHC3_D8(0x17059, 0x17059, 0x10059)
+#define MX6SL_USDHC3_PINGRP_D8_100MHZ MX6SL_USDHC3_D8(0x170b9, 0x170b9, 0x100b9)
+#define MX6SL_USDHC3_PINGRP_D8_200MHZ MX6SL_USDHC3_D8(0x170f9, 0x170f9, 0x100f9)
+
+#define MX6SL_USDHC4_PINGRP_D4       MX6SL_USDHC4_D4(0x17059, 0x17059, 0x10059)
+#define MX6SL_USDHC4_PINGRP_D4_100MHZ MX6SL_USDHC4_D4(0x170b9, 0x170b9, 0x100b9)
+#define MX6SL_USDHC4_PINGRP_D4_200MHZ MX6SL_USDHC4_D4(0x170f9, 0x170f9, 0x100f9)
+#define MX6SL_USDHC4_PINGRP_D8       MX6SL_USDHC4_D8(0x17059, 0x17059, 0x10059)
+#define MX6SL_USDHC4_PINGRP_D8_100MHZ MX6SL_USDHC4_D8(0x170b9, 0x170b9, 0x100b9)
+#define MX6SL_USDHC4_PINGRP_D8_200MHZ MX6SL_USDHC4_D8(0x170f9, 0x170f9, 0x100f9)
 
 #endif /* __DTS_IMX6SL_PINGRP_H */