]> git.sur5r.net Git - u-boot/commitdiff
ARM: dts: uniphier: rework System Bus nodes
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 16 Feb 2016 08:00:22 +0000 (17:00 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Sun, 28 Feb 2016 18:50:15 +0000 (03:50 +0900)
Follow the changes of DTS in Linux.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
arch/arm/dts/uniphier-common32.dtsi
arch/arm/dts/uniphier-ph1-sld3.dtsi

index 59511bde946970f61e0dba658fa9be30bfed5349..7d59112ddd1d11f26139385188c952d56a69e3f0 100644 (file)
                ranges;
                interrupt-parent = <&intc>;
 
-               extbus: extbus {
-                       compatible = "simple-bus";
-                       #address-cells = <2>;
-                       #size-cells = <1>;
-               };
-
                serial0: serial@54006800 {
                        compatible = "socionext,uniphier-uart";
                        status = "disabled";
                        clocks = <&uart_clk>;
                };
 
-               system-bus-controller@58c00000 {
-                       compatible = "socionext,uniphier-system-bus-controller";
-                       reg = <0x58c00000 0x400>, <0x59800000 0x2000>;
+               system_bus: system-bus@58c00000 {
+                       compatible = "socionext,uniphier-system-bus";
+                       reg = <0x58c00000 0x400>;
+                       #address-cells = <2>;
+                       #size-cells = <1>;
+               };
+
+               smpctrl@59800000 {
+                       compatible = "socionext,uniphier-smpctrl";
+                       reg = <0x59801000 0x400>;
                };
 
                mio: mioctrl@59810000 {
index 85dde66f07db9f372f8301bc881007a4b7b743ad..e01bd30345abfae322acd0754e2468b615afb511 100644 (file)
                ranges;
                interrupt-parent = <&intc>;
 
-               extbus: extbus {
-                       compatible = "simple-bus";
-                       #address-cells = <2>;
-                       #size-cells = <1>;
-               };
-
                timer@20000200 {
                        compatible = "arm,cortex-a9-global-timer";
                        reg = <0x20000200 0x20>;
                        clock-frequency = <400000>;
                };
 
-               system-bus-controller-misc@59800000 {
-                       compatible = "socionext,uniphier-system-bus-controller-misc",
-                                    "syscon";
-                       reg = <0x59800000 0x2000>;
+               system_bus: system-bus@58c00000 {
+                       compatible = "socionext,uniphier-system-bus";
+                       reg = <0x58c00000 0x400>;
+                       #address-cells = <2>;
+                       #size-cells = <1>;
+               };
+
+               smpctrl@59800000 {
+                       compatible = "socionext,uniphier-smpctrl";
+                       reg = <0x59801000 0x400>;
                };
 
                mio: mioctrl@59810000 {