Merge tag 'zynq-dt-for-v5.0' of https://github.com/Xilinx/linux-xlnx into next/dt
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Dec 2018 15:32:23 +0000 (16:32 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Dec 2018 15:32:27 +0000 (16:32 +0100)
arm: dts: zynq: DT changes for v5.0

- Fix mmc node name

* tag 'zynq-dt-for-v5.0' of https://github.com/Xilinx/linux-xlnx:
  ARM: dts: Use mmc@ instead sdhci@

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/boot/dts/zynq-7000.dtsi

index e22507e2330327c446e6b6ac70e57a5eff95f970..ca6425ad794ce354effc1b26ef412220f3d8e51d 100644 (file)
                        #size-cells = <0>;
                };
 
-               sdhci0: sdhci@e0100000 {
+               sdhci0: mmc@e0100000 {
                        compatible = "arasan,sdhci-8.9a";
                        status = "disabled";
                        clock-names = "clk_xin", "clk_ahb";
                        reg = <0xe0100000 0x1000>;
                };
 
-               sdhci1: sdhci@e0101000 {
+               sdhci1: mmc@e0101000 {
                        compatible = "arasan,sdhci-8.9a";
                        status = "disabled";
                        clock-names = "clk_xin", "clk_ahb";