arm64: dts: marvell: Update network description to match schema

Update the PP2 ethernet ports subnodes' names to match
schema enforced by the marvell,pp2.yaml contents.

Add new required properties ('reg') which contains information
about the port ID, keeping 'port-id' ones for backward
compatibility.

Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
index d6c0990..7d00438 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
@@ -58,6 +58,8 @@
                ranges = <0x0 0x0 ADDRESSIFY(CP11X_BASE) 0x2000000>;
 
                CP11X_LABEL(ethernet): ethernet@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
                        compatible = "marvell,armada-7k-pp22";
                        reg = <0x0 0x100000>, <0x129000 0xb000>, <0x220000 0x800>;
                        clocks = <&CP11X_LABEL(clk) 1 3>, <&CP11X_LABEL(clk) 1 9>,
@@ -69,7 +71,7 @@
                        status = "disabled";
                        dma-coherent;
 
-                       CP11X_LABEL(eth0): eth0 {
+                       CP11X_LABEL(eth0): ethernet-port@0 {
                                interrupts = <39 IRQ_TYPE_LEVEL_HIGH>,
                                        <43 IRQ_TYPE_LEVEL_HIGH>,
                                        <47 IRQ_TYPE_LEVEL_HIGH>,
@@ -83,12 +85,13 @@
                                interrupt-names = "hif0", "hif1", "hif2",
                                        "hif3", "hif4", "hif5", "hif6", "hif7",
                                        "hif8", "link";
-                               port-id = <0>;
+                               reg = <0>;
+                               port-id = <0>; /* For backward compatibility. */
                                gop-port-id = <0>;
                                status = "disabled";
                        };
 
-                       CP11X_LABEL(eth1): eth1 {
+                       CP11X_LABEL(eth1): ethernet-port@1 {
                                interrupts = <40 IRQ_TYPE_LEVEL_HIGH>,
                                        <44 IRQ_TYPE_LEVEL_HIGH>,
                                        <48 IRQ_TYPE_LEVEL_HIGH>,
@@ -102,12 +105,13 @@
                                interrupt-names = "hif0", "hif1", "hif2",
                                        "hif3", "hif4", "hif5", "hif6", "hif7",
                                        "hif8", "link";
-                               port-id = <1>;
+                               reg = <1>;
+                               port-id = <1>; /* For backward compatibility. */
                                gop-port-id = <2>;
                                status = "disabled";
                        };
 
-                       CP11X_LABEL(eth2): eth2 {
+                       CP11X_LABEL(eth2): ethernet-port@2 {
                                interrupts = <41 IRQ_TYPE_LEVEL_HIGH>,
                                        <45 IRQ_TYPE_LEVEL_HIGH>,
                                        <49 IRQ_TYPE_LEVEL_HIGH>,
@@ -121,7 +125,8 @@
                                interrupt-names = "hif0", "hif1", "hif2",
                                        "hif3", "hif4", "hif5", "hif6", "hif7",
                                        "hif8", "link";
-                               port-id = <2>;
+                               reg = <2>;
+                               port-id = <2>; /* For backward compatibility. */
                                gop-port-id = <3>;
                                status = "disabled";
                        };