Merge branch 'elan-i2c' into next

[linux-2.6-microblaze.git] / arch / arm / boot / dts / uniphier-sld8.dtsi

diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index 4fc6676..0999216 100644 (file)
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -51,7 +51,7 @@
                ranges;
                interrupt-parent = <&intc>;
 
-               l2: l2-cache@500c0000 {
+               l2: cache-controller@500c0000 {
                        compatible = "socionext,uniphier-system-cache";
                        reg = <0x500c0000 0x2000>, <0x503c0100 0x4>,
                              <0x506c0000 0x400>;
@@ -249,7 +249,7 @@
                        #dma-cells = <1>;
                };
 
-               sd: sdhc@5a400000 {
+               sd: mmc@5a400000 {
                        compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a400000 0x200>;
@@ -269,7 +269,7 @@
                        sd-uhs-sdr50;
                };
 
-               emmc: sdhc@5a500000 {
+               emmc: mmc@5a500000 {
                        compatible = "socionext,uniphier-sd-v2.91";
                        status = "disabled";
                        reg = <0x5a500000 0x200>;
@@ -379,7 +379,7 @@
                        interrupt-controller;
                };
 
-               aidet: aidet@61830000 {
+               aidet: interrupt-controller@61830000 {
                        compatible = "socionext,uniphier-sld8-aidet";
                        reg = <0x61830000 0x200>;
                        interrupt-controller;
@@ -402,7 +402,7 @@
                        };
                };
 
-               nand: nand@68000000 {
+               nand: nand-controller@68000000 {
                        compatible = "socionext,uniphier-denali-nand-v5a";
                        status = "disabled";
                        reg-names = "nand_data", "denali_reg";