ARM: dts: stm32mp15: use DDR3 files generated by STM32CubeMX

[oweals/u-boot.git] / arch / arm / dts / uniphier-pro5.dtsi

diff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi
index 9cad79d0860e9a4873f4a32333651c70c8a27a11..ba7e224b38e6c2549698ab77989a6741e443c6cd 100644 (file)
--- a/arch/arm/dts/uniphier-pro5.dtsi
+++ b/arch/arm/dts/uniphier-pro5.dtsi
@@ -131,7 +131,7 @@
                ranges;
                interrupt-parent = <&intc>;
 
-               l2: l2-cache@500c0000 {
+               l2: cache-controller@500c0000 {
                        compatible = "socionext,uniphier-system-cache";
                        reg = <0x500c0000 0x2000>, <0x503c0100 0x8>,
                              <0x506c0000 0x400>;
@@ -144,7 +144,7 @@
                        next-level-cache = <&l3>;
                };
 
-               l3: l3-cache@500c8000 {
+               l3: cache-controller@500c8000 {
                        compatible = "socionext,uniphier-system-cache";
                        reg = <0x500c8000 0x2000>, <0x503c8100 0x8>,
                              <0x506c8000 0x400>;
@@ -408,7 +408,7 @@
                        };
                };
 
-               aidet: aidet@5fc20000 {
+               aidet: interrupt-controller@5fc20000 {
                        compatible = "socionext,uniphier-pro5-aidet";
                        reg = <0x5fc20000 0x200>;
                        interrupt-controller;
@@ -489,7 +489,7 @@
                        };
                };
 
-               nand: nand@68000000 {
+               nand: nand-controller@68000000 {
                        compatible = "socionext,uniphier-denali-nand-v5b";
                        status = "disabled";
                        reg-names = "nand_data", "denali_reg";
@@ -499,10 +499,11 @@
                        pinctrl-0 = <&pinctrl_nand2cs>;
                        clock-names = "nand", "nand_x", "ecc";
                        clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
-                       resets = <&sys_rst 2>;
+                       reset-names = "nand", "reg";
+                       resets = <&sys_rst 2>, <&sys_rst 2>;
                };
 
-               emmc: sdhc@68400000 {
+               emmc: mmc@68400000 {
                        compatible = "socionext,uniphier-sd-v3.1";
                        status = "disabled";
                        reg = <0x68400000 0x800>;
@@ -518,7 +519,7 @@
                        non-removable;
                };
 
-               sd: sdhc@68800000 {
+               sd: mmc@68800000 {
                        compatible = "socionext,uniphier-sd-v3.1";
                        status = "disabled";
                        reg = <0x68800000 0x800>;