Merge tag 'u-boot-imx-20191105' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / imx53-cx9020.dts

diff --git a/arch/arm/dts/imx53-cx9020.dts b/arch/arm/dts/imx53-cx9020.dts
index 9610301d53da43a42cd86405008c77875dc090c7..36ceae36aa9091558a33ab27c81884ad92eb3868 100644 (file)
--- a/arch/arm/dts/imx53-cx9020.dts
+++ b/arch/arm/dts/imx53-cx9020.dts
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+ OR X11
 /*
  * Copyright 2016 Beckhoff Automation
  * Copyright 2011 Freescale Semiconductor, Inc.
  * Copyright 2011 Linaro Ltd.
- *
- * SPDX-License-Identifier:     GPL-2.0+ or X11
  */
 
 /dts-v1/;
@@ -100,30 +99,16 @@
                                MX53_PAD_KEY_COL1__AUDMUX_AUD5_TXFS     0x80000000
                                MX53_PAD_KEY_ROW1__AUDMUX_AUD5_RXD      0x80000000
 
-                               MX53_PAD_SD1_DATA0__ESDHC1_DAT0         0x1d5
-                               MX53_PAD_SD1_DATA1__ESDHC1_DAT1         0x1d5
-                               MX53_PAD_SD1_DATA2__ESDHC1_DAT2         0x1d5
-                               MX53_PAD_SD1_DATA3__ESDHC1_DAT3         0x1d5
-                               MX53_PAD_SD1_CMD__ESDHC1_CMD            0x1d5
-                               MX53_PAD_SD1_CLK__ESDHC1_CLK            0x1d5
-
-                               MX53_PAD_SD2_DATA0__ESDHC2_DAT0         0x1d5
-                               MX53_PAD_SD2_DATA1__ESDHC2_DAT1         0x1d5
-                               MX53_PAD_SD2_DATA2__ESDHC2_DAT2         0x1d5
-                               MX53_PAD_SD2_DATA3__ESDHC2_DAT3         0x1d5
-                               MX53_PAD_SD2_CMD__ESDHC2_CMD            0x1d5
-                               MX53_PAD_SD2_CLK__ESDHC2_CLK            0x1d5
-
-                               MX53_PAD_FEC_MDC__FEC_MDC               0x80000000
-                               MX53_PAD_FEC_MDIO__FEC_MDIO             0x80000000
-                               MX53_PAD_FEC_REF_CLK__FEC_TX_CLK        0x80000000
-                               MX53_PAD_FEC_RX_ER__FEC_RX_ER           0x80000000
-                               MX53_PAD_FEC_CRS_DV__FEC_RX_DV          0x80000000
-                               MX53_PAD_FEC_RXD1__FEC_RDATA_1          0x80000000
-                               MX53_PAD_FEC_RXD0__FEC_RDATA_0          0x80000000
-                               MX53_PAD_FEC_TX_EN__FEC_TX_EN           0x80000000
-                               MX53_PAD_FEC_TXD1__FEC_TDATA_1          0x80000000
-                               MX53_PAD_FEC_TXD0__FEC_TDATA_0          0x80000000
+                               MX53_PAD_FEC_MDC__FEC_MDC               0x4
+                               MX53_PAD_FEC_MDIO__FEC_MDIO             0x1fc
+                               MX53_PAD_FEC_REF_CLK__FEC_TX_CLK        0x180
+                               MX53_PAD_FEC_RX_ER__FEC_RX_ER           0x180
+                               MX53_PAD_FEC_CRS_DV__FEC_RX_DV          0x180
+                               MX53_PAD_FEC_RXD1__FEC_RDATA_1          0x180
+                               MX53_PAD_FEC_RXD0__FEC_RDATA_0          0x180
+                               MX53_PAD_FEC_TX_EN__FEC_TX_EN           0x4
+                               MX53_PAD_FEC_TXD1__FEC_TDATA_1          0x4
+                               MX53_PAD_FEC_TXD0__FEC_TDATA_0          0x4
 
                                MX53_PAD_CSI0_DAT8__I2C1_SDA            0x400001ec
                                MX53_PAD_CSI0_DAT9__I2C1_SCL            0x400001ec
@@ -163,6 +148,28 @@
                        >;
                };
 
+               pinctrl_esdhc1: esdhc1grp {
+                       fsl,pins = <
+                               MX53_PAD_SD1_DATA0__ESDHC1_DAT0         0x1d5
+                               MX53_PAD_SD1_DATA1__ESDHC1_DAT1         0x1d5
+                               MX53_PAD_SD1_DATA2__ESDHC1_DAT2         0x1d5
+                               MX53_PAD_SD1_DATA3__ESDHC1_DAT3         0x1d5
+                               MX53_PAD_SD1_CMD__ESDHC1_CMD            0x1d5
+                               MX53_PAD_SD1_CLK__ESDHC1_CLK            0x1d5
+                       >;
+               };
+
+               pinctrl_esdhc2: esdhc2grp {
+                       fsl,pins = <
+                               MX53_PAD_SD2_DATA0__ESDHC2_DAT0         0x1d5
+                               MX53_PAD_SD2_DATA1__ESDHC2_DAT1         0x1d5
+                               MX53_PAD_SD2_DATA2__ESDHC2_DAT2         0x1d5
+                               MX53_PAD_SD2_DATA3__ESDHC2_DAT3         0x1d5
+                               MX53_PAD_SD2_CMD__ESDHC2_CMD            0x1d5
+                               MX53_PAD_SD2_CLK__ESDHC2_CLK            0x1d5
+                       >;
+               };
+
                pinctrl_uart2: uart2grp {
                        fsl,pins = <
                                MX53_PAD_EIM_D26__UART2_RXD_MUX 0x1e4
@@ -182,6 +189,22 @@
        status = "okay";
 };
 
+&esdhc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_esdhc1>;
+       cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
+       bus-width = <4>;
+       status = "okay";
+};
+
+&esdhc2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_esdhc2>;
+       cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+       bus-width = <4>;
+       status = "okay";
+};
+
 &fec {
        pinctrl-names = "default";
        phy-mode = "rmii";