arm64: dts: hisilicon: hip07: move non-MMIO node out of soc

Non-MMIO devices, which are BTW not really part of the SoC, should not
be within simple-bus, as reported by dtc W=1 warning:

  hip07.dtsi:1486.20-1493.5: Warning (unit_address_vs_reg): /soc/ethernet@4: node has a unit name, but no reg or ranges property

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/arch/arm64/boot/dts/hisilicon/hip07.dtsi b/arch/arm64/boot/dts/hisilicon/hip07.dtsi
index 81d907ef43ed2d3ee5975d5fc79e68bc019f631b..9d1e86553ea8f7d6ab72df57886831ef60b8792d 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hip07.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hip07.dtsi
@@ -1013,6 +1013,42 @@
                };
        };
 
+       eth0: ethernet-0 {
+               compatible = "hisilicon,hns-nic-v2";
+               ae-handle = <&dsaf0>;
+               port-idx-in-ae = <4>;
+               local-mac-address = [00 00 00 00 00 00];
+               status = "disabled";
+               dma-coherent;
+       };
+
+       eth1: ethernet-1 {
+               compatible = "hisilicon,hns-nic-v2";
+               ae-handle = <&dsaf0>;
+               port-idx-in-ae = <5>;
+               local-mac-address = [00 00 00 00 00 00];
+               status = "disabled";
+               dma-coherent;
+       };
+
+       eth2: ethernet-2 {
+               compatible = "hisilicon,hns-nic-v2";
+               ae-handle = <&dsaf0>;
+               port-idx-in-ae = <0>;
+               local-mac-address = [00 00 00 00 00 00];
+               status = "disabled";
+               dma-coherent;
+       };
+
+       eth3: ethernet-3 {
+               compatible = "hisilicon,hns-nic-v2";
+               ae-handle = <&dsaf0>;
+               port-idx-in-ae = <1>;
+               local-mac-address = [00 00 00 00 00 00];
+               status = "disabled";
+               dma-coherent;
+       };
+
        timer {
                compatible = "arm,armv8-timer";
                interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
@@ -1483,42 +1519,6 @@
                        };
                };
 
-               eth0: ethernet@4 {
-                       compatible = "hisilicon,hns-nic-v2";
-                       ae-handle = <&dsaf0>;
-                       port-idx-in-ae = <4>;
-                       local-mac-address = [00 00 00 00 00 00];
-                       status = "disabled";
-                       dma-coherent;
-               };
-
-               eth1: ethernet@5 {
-                       compatible = "hisilicon,hns-nic-v2";
-                       ae-handle = <&dsaf0>;
-                       port-idx-in-ae = <5>;
-                       local-mac-address = [00 00 00 00 00 00];
-                       status = "disabled";
-                       dma-coherent;
-               };
-
-               eth2: ethernet@0 {
-                       compatible = "hisilicon,hns-nic-v2";
-                       ae-handle = <&dsaf0>;
-                       port-idx-in-ae = <0>;
-                       local-mac-address = [00 00 00 00 00 00];
-                       status = "disabled";
-                       dma-coherent;
-               };
-
-               eth3: ethernet@1 {
-                       compatible = "hisilicon,hns-nic-v2";
-                       ae-handle = <&dsaf0>;
-                       port-idx-in-ae = <1>;
-                       local-mac-address = [00 00 00 00 00 00];
-                       status = "disabled";
-                       dma-coherent;
-               };
-
                infiniband@c4000000 {
                        compatible = "hisilicon,hns-roce-v1";
                        reg = <0x0 0xc4000000 0x0 0x100000>;