sdk: ppc: dts: accumulated DPAA1 updates to existing files

Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
Signed-off-by: Madalin Bucur <madalin.bucur@nxp.com>
Signed-off-by: Li Yang <leoyang.li@nxp.com>

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi
index eb77675..29c4c83 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x10: port@90000 {
                cell-index = <0x10>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-10g-rx";
                reg = <0x90000 0x1000>;
        };
 
        fman0_tx_0x30: port@b0000 {
                cell-index = <0x30>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-10g-tx";
                reg = <0xb0000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi
index b965bc2..f8f44eb 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x08: port@88000 {
                cell-index = <0x8>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-1g-rx";
                reg = <0x88000 0x1000>;
        };
 
        fman0_tx_0x28: port@a8000 {
                cell-index = <0x28>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-1g-tx";
                reg = <0xa8000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi
index 9eb6e6d..4e55ac7 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x09: port@89000 {
                cell-index = <0x9>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-1g-rx";
                reg = <0x89000 0x1000>;
        };
 
        fman0_tx_0x29: port@a9000 {
                cell-index = <0x29>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-1g-tx";
                reg = <0xa9000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi
index 092b899..4c53795 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x0a: port@8a000 {
                cell-index = <0xa>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8a000 0x1000>;
        };
 
        fman0_tx_0x2a: port@aa000 {
                cell-index = <0x2a>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-1g-tx";
                reg = <0xaa000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi
index 2df0dc8..1d458ed 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x0b: port@8b000 {
                cell-index = <0xb>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8b000 0x1000>;
        };
 
        fman0_tx_0x2b: port@ab000 {
                cell-index = <0x2b>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-1g-tx";
                reg = <0xab000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi
index 5fceb24..e2f4dc7 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x0c: port@8c000 {
                cell-index = <0xc>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8c000 0x1000>;
        };
 
        fman0_tx_0x2c: port@ac000 {
                cell-index = <0x2c>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-1g-tx";
                reg = <0xac000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi
index 83ae87b..3e2ef2b 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x10: port@90000 {
                cell-index = <0x10>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-10g-rx";
                reg = <0x90000 0x1000>;
        };
 
        fman1_tx_0x30: port@b0000 {
                cell-index = <0x30>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-10g-tx";
                reg = <0xb0000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi
index b0f0e36..8b41c39 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x08: port@88000 {
                cell-index = <0x8>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-1g-rx";
                reg = <0x88000 0x1000>;
        };
 
        fman1_tx_0x28: port@a8000 {
                cell-index = <0x28>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-1g-tx";
                reg = <0xa8000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi
index a3a79f8..91dad61 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x09: port@89000 {
                cell-index = <0x9>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-1g-rx";
                reg = <0x89000 0x1000>;
        };
 
        fman1_tx_0x29: port@a9000 {
                cell-index = <0x29>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-1g-tx";
                reg = <0xa9000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi
index 96a69a8..26ed88f 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x0a: port@8a000 {
                cell-index = <0xa>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8a000 0x1000>;
        };
 
        fman1_tx_0x2a: port@aa000 {
                cell-index = <0x2a>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-1g-tx";
                reg = <0xaa000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi
index 7405d19..dd708f3 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x0b: port@8b000 {
                cell-index = <0xb>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8b000 0x1000>;
        };
 
        fman1_tx_0x2b: port@ab000 {
                cell-index = <0x2b>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-1g-tx";
                reg = <0xab000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi
index f49ad69..0c6aba0 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x0c: port@8c000 {
                cell-index = <0xc>;
-               compatible = "fsl,fman-v2-port-rx";
+               compatible = "fsl,fman-v2-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8c000 0x1000>;
        };
 
        fman1_tx_0x2c: port@ac000 {
                cell-index = <0x2c>;
-               compatible = "fsl,fman-v2-port-tx";
+               compatible = "fsl,fman-v2-port-tx","fsl,fman-port-1g-tx";
                reg = <0xac000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi
index baa0c50..8c239cd 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi
@@ -35,7 +35,7 @@
 fman@400000 {
        fman0_rx_0x08: port@88000 {
                cell-index = <0x8>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-10g-rx";
                reg = <0x88000 0x1000>;
                fsl,fman-10g-port;
                fsl,fman-best-effort-port;
@@ -43,7 +43,7 @@ fman@400000 {
 
        fman0_tx_0x28: port@a8000 {
                cell-index = <0x28>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-10g-tx";
                reg = <0xa8000 0x1000>;
                fsl,fman-10g-port;
                fsl,fman-best-effort-port;

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi
index 9309560..f310f45 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi
@@ -35,14 +35,14 @@
 fman@400000 {
        fman0_rx_0x10: port@90000 {
                cell-index = <0x10>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx", "fsl,fman-port-10g-rx";
                reg = <0x90000 0x1000>;
                fsl,fman-10g-port;
        };
 
        fman0_tx_0x30: port@b0000 {
                cell-index = <0x30>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx", "fsl,fman-port-10g-tx";
                reg = <0xb0000 0x1000>;
                fsl,fman-10g-port;
        };

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi
index ff4bd38..5b53075 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi
@@ -35,7 +35,7 @@
 fman@400000 {
        fman0_rx_0x09: port@89000 {
                cell-index = <0x9>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-10g-rx";
                reg = <0x89000 0x1000>;
                fsl,fman-10g-port;
                fsl,fman-best-effort-port;
@@ -43,7 +43,7 @@ fman@400000 {
 
        fman0_tx_0x29: port@a9000 {
                cell-index = <0x29>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-10g-tx";
                reg = <0xa9000 0x1000>;
                fsl,fman-10g-port;
                fsl,fman-best-effort-port;

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi
index 1fa38ed..f42856e 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi
@@ -35,14 +35,14 @@
 fman@400000 {
        fman0_rx_0x11: port@91000 {
                cell-index = <0x11>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx", "fsl,fman-port-10g-rx";
                reg = <0x91000 0x1000>;
                fsl,fman-10g-port;
        };
 
        fman0_tx_0x31: port@b1000 {
                cell-index = <0x31>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx", "fsl,fman-port-10g-tx";
                reg = <0xb1000 0x1000>;
                fsl,fman-10g-port;
        };

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi
index a8cc978..eab7e90 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x08: port@88000 {
                cell-index = <0x8>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x88000 0x1000>;
        };
 
        fman0_tx_0x28: port@a8000 {
                cell-index = <0x28>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xa8000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi
index 8b8bd70..2e37b6c 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x09: port@89000 {
                cell-index = <0x9>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x89000 0x1000>;
        };
 
        fman0_tx_0x29: port@a9000 {
                cell-index = <0x29>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xa9000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi
index 619c880..be3e7c8 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x0a: port@8a000 {
                cell-index = <0xa>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8a000 0x1000>;
        };
 
        fman0_tx_0x2a: port@aa000 {
                cell-index = <0x2a>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xaa000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi
index d7ebb73..5fab79e 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x0b: port@8b000 {
                cell-index = <0xb>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8b000 0x1000>;
        };
 
        fman0_tx_0x2b: port@ab000 {
                cell-index = <0x2b>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xab000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi
index b151d69..7675c7b 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x0c: port@8c000 {
                cell-index = <0xc>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8c000 0x1000>;
        };
 
        fman0_tx_0x2c: port@ac000 {
                cell-index = <0x2c>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xac000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi
index adc0ae0..dbab7e1 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi
@@ -35,13 +35,13 @@
 fman@400000 {
        fman0_rx_0x0d: port@8d000 {
                cell-index = <0xd>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8d000 0x1000>;
        };
 
        fman0_tx_0x2d: port@ad000 {
                cell-index = <0x2d>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xad000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi
index 435047e..58780bb 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi
@@ -35,14 +35,14 @@
 fman@500000 {
        fman1_rx_0x10: port@90000 {
                cell-index = <0x10>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-10g-rx";
                reg = <0x90000 0x1000>;
                fsl,fman-10g-port;
        };
 
        fman1_tx_0x30: port@b0000 {
                cell-index = <0x30>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-10g-tx";
                reg = <0xb0000 0x1000>;
                fsl,fman-10g-port;
        };

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi
index c098657..0da76c1 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi
@@ -35,14 +35,14 @@
 fman@500000 {
        fman1_rx_0x11: port@91000 {
                cell-index = <0x11>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-10g-rx";
                reg = <0x91000 0x1000>;
                fsl,fman-10g-port;
        };
 
        fman1_tx_0x31: port@b1000 {
                cell-index = <0x31>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-10g-tx";
                reg = <0xb1000 0x1000>;
                fsl,fman-10g-port;
        };

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi
index 9d06824..e1d7067 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x08: port@88000 {
                cell-index = <0x8>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x88000 0x1000>;
        };
 
        fman1_tx_0x28: port@a8000 {
                cell-index = <0x28>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xa8000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi
index 70e9477..1db943e 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x09: port@89000 {
                cell-index = <0x9>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x89000 0x1000>;
        };
 
        fman1_tx_0x29: port@a9000 {
                cell-index = <0x29>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xa9000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi
index ad96e65..08346b5 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x0a: port@8a000 {
                cell-index = <0xa>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8a000 0x1000>;
        };
 
        fman1_tx_0x2a: port@aa000 {
                cell-index = <0x2a>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xaa000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi
index 034bc4b..11ee2e9 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x0b: port@8b000 {
                cell-index = <0xb>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8b000 0x1000>;
        };
 
        fman1_tx_0x2b: port@ab000 {
                cell-index = <0x2b>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xab000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi
index 93ca23d..ad6cc16 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x0c: port@8c000 {
                cell-index = <0xc>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8c000 0x1000>;
        };
 
        fman1_tx_0x2c: port@ac000 {
                cell-index = <0x2c>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xac000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi
index 23b3117..f64a6c4 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi
@@ -35,13 +35,13 @@
 fman@500000 {
        fman1_rx_0x0d: port@8d000 {
                cell-index = <0xd>;
-               compatible = "fsl,fman-v3-port-rx";
+               compatible = "fsl,fman-v3-port-rx","fsl,fman-port-1g-rx";
                reg = <0x8d000 0x1000>;
        };
 
        fman1_tx_0x2d: port@ad000 {
                cell-index = <0x2d>;
-               compatible = "fsl,fman-v3-port-tx";
+               compatible = "fsl,fman-v3-port-tx","fsl,fman-port-1g-tx";
                reg = <0xad000 0x1000>;
        };
 

diff --git a/arch/powerpc/boot/dts/fsl/t1023rdb.dts b/arch/powerpc/boot/dts/fsl/t1023rdb.dts
index 5ba6fbf..a7affbe 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t1023rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1023rdb.dts
@@ -142,23 +142,23 @@
                };
 
                fman@400000 {
-                       fm1mac1: ethernet@e0000 {
+                       enet0: ethernet@e0000 {
                                phy-handle = <&sgmii_rtk_phy2>;
                                phy-connection-type = "sgmii";
                                sleep = <&rcpm 0x80000000>;
                        };
 
-                       fm1mac2: ethernet@e2000 {
+                       enet1: ethernet@e2000 {
                                sleep = <&rcpm 0x40000000>;
                        };
 
-                       fm1mac3: ethernet@e4000 {
+                       enet2: ethernet@e4000 {
                                phy-handle = <&sgmii_aqr_phy3>;
                                phy-connection-type = "sgmii-2500";
                                sleep = <&rcpm 0x20000000>;
                        };
 
-                       fm1mac4: ethernet@e6000 {
+                       enet3: ethernet@e6000 {
                                phy-handle = <&rgmii_rtk_phy1>;
                                phy-connection-type = "rgmii";
                                sleep = <&rcpm 0x10000000>;

diff --git a/arch/powerpc/boot/dts/fsl/t1024rdb.dts b/arch/powerpc/boot/dts/fsl/t1024rdb.dts
index fe1e783..605ceec 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/t1024rdb.dts
+++ b/arch/powerpc/boot/dts/fsl/t1024rdb.dts
@@ -174,23 +174,23 @@
                };
 
                fman@400000 {
-                       fm1mac1: ethernet@e0000 {
+                       enet0: ethernet@e0000 {
                                phy-handle = <&xg_aqr105_phy3>;
                                phy-connection-type = "xgmii";
                                sleep = <&rcpm 0x80000000>;
                        };
 
-                       fm1mac2: ethernet@e2000 {
+                       enet1: ethernet@e2000 {
                                sleep = <&rcpm 0x40000000>;
                        };
 
-                       fm1mac3: ethernet@e4000 {
+                       enet2: ethernet@e4000 {
                                phy-handle = <&rgmii_phy2>;
                                phy-connection-type = "rgmii";
                                sleep = <&rcpm 0x20000000>;
                        };
 
-                       fm1mac4: ethernet@e6000 {
+                       enet3: ethernet@e6000 {
                                phy-handle = <&rgmii_phy1>;
                                phy-connection-type = "rgmii";
                                sleep = <&rcpm 0x10000000>;