Merge tag 'ceph-for-4.17-rc1' of git://github.com/ceph/ceph-client

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx25-pdk.dts

diff --git a/arch/arm/boot/dts/imx25-pdk.dts b/arch/arm/boot/dts/imx25-pdk.dts
index 2d15ce72d006a63b4ee2be4ef65c72c0e0861f15..7f9bd052b84ef1c222441b6a59032822eb21e2e9 100644 (file)
--- a/arch/arm/boot/dts/imx25-pdk.dts
+++ b/arch/arm/boot/dts/imx25-pdk.dts
@@ -18,7 +18,7 @@
        model = "Freescale i.MX25 Product Development Kit";
        compatible = "fsl,imx25-pdk", "fsl,imx25";
 
-       memory {
+       memory@80000000 {
                reg = <0x80000000 0x4000000>;
        };
 
@@ -165,12 +165,12 @@
 
                pinctrl_esdhc1: esdhc1grp {
                        fsl,pins = <
-                               MX25_PAD_SD1_CMD__SD1_CMD               0x80000000
-                               MX25_PAD_SD1_CLK__SD1_CLK               0x80000000
-                               MX25_PAD_SD1_DATA0__SD1_DATA0           0x80000000
-                               MX25_PAD_SD1_DATA1__SD1_DATA1           0x80000000
-                               MX25_PAD_SD1_DATA2__SD1_DATA2           0x80000000
-                               MX25_PAD_SD1_DATA3__SD1_DATA3           0x80000000
+                               MX25_PAD_SD1_CMD__ESDHC1_CMD            0x80000000
+                               MX25_PAD_SD1_CLK__ESDHC1_CLK            0x80000000
+                               MX25_PAD_SD1_DATA0__ESDHC1_DAT0         0x80000000
+                               MX25_PAD_SD1_DATA1__ESDHC1_DAT1         0x80000000
+                               MX25_PAD_SD1_DATA2__ESDHC1_DAT2         0x80000000
+                               MX25_PAD_SD1_DATA3__ESDHC1_DAT3         0x80000000
                                MX25_PAD_A14__GPIO_2_0                  0x80000000
                                MX25_PAD_A15__GPIO_2_1                  0x80000000
                        >;