ARM: dts: uniphier: simplify support-card node structure

This device hierarchy is needlessly complex.

Remove the support-card node level, and move the ethernet and serial
nodes right under the system-bus node.

This also fixes the following warning from 'make ARCH=arm dtbs_check':

  support-card@1,1f00000: $nodename:0: 'support-card@1,1f00000' does not match '^(bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$'

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/boot/dts/uniphier-support-card.dtsi b/arch/arm/boot/dts/uniphier-support-card.dtsi
index 11e46e7de7c59a109cadae68720db59f8678b4b6..444802fee9fb020e88479f6b046bee15178e8c9f 100644 (file)
--- a/arch/arm/boot/dts/uniphier-support-card.dtsi
+++ b/arch/arm/boot/dts/uniphier-support-card.dtsi
@@ -8,26 +8,19 @@
 &system_bus {
        status = "okay";
        ranges = <1 0x00000000 0x42000000 0x02000000>;
+       interrupt-parent = <&gpio>;
 
-       support_card: support-card@1,1f00000 {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges = <0x00000000 1 0x01f00000 0x00100000>;
-               interrupt-parent = <&gpio>;
-
-               ethsc: ethernet@0 {
-                       compatible = "smsc,lan9118", "smsc,lan9115";
-                       reg = <0x00000000 0x1000>;
-                       phy-mode = "mii";
-                       reg-io-width = <4>;
-               };
+       ethsc: ethernet@1,1f00000 {
+               compatible = "smsc,lan9118", "smsc,lan9115";
+               reg = <1 0x01f00000 0x1000>;
+               phy-mode = "mii";
+               reg-io-width = <4>;
+       };
 
-               serialsc: serial@b0000 {
-                       compatible = "ns16550a";
-                       reg = <0x000b0000 0x20>;
-                       clock-frequency = <12288000>;
-                       reg-shift = <1>;
-               };
+       serialsc: serial@1,1fb0000 {
+               compatible = "ns16550a";
+               reg = <1 0x01fb0000 0x20>;
+               clock-frequency = <12288000>;
+               reg-shift = <1>;
        };
 };