powerpc: dts: qoriq: update the mdio offsets under the second FMan v3

When two FMan's are present on a board, the MDIO nodes are found at the
same offsets inside each FMan. This causes "non unique device name"
errors when registering the MDIO nodes under the second FMan. Fix this
by updating the offsets of the MDIO nodes to include the parent FMan's
offset.

Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/arch/powerpc/dts/qoriq-fman3-1-10g-0.dtsi b/arch/powerpc/dts/qoriq-fman3-1-10g-0.dtsi
index 889c8d450e091147af5c6d44b8b3173e93d66169..65bb8a4b0b63f26b54a40eaf7aac156560f78522 100644 (file)
--- a/arch/powerpc/dts/qoriq-fman3-1-10g-0.dtsi
+++ b/arch/powerpc/dts/qoriq-fman3-1-10g-0.dtsi
@@ -30,7 +30,7 @@ fman@500000 {
                pcsphy-handle = <&pcsphy14>;
        };
 
-       mdio@f1000 {
+       mdio@5f1000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

diff --git a/arch/powerpc/dts/qoriq-fman3-1-10g-1.dtsi b/arch/powerpc/dts/qoriq-fman3-1-10g-1.dtsi
index 2e456983372c98d3ff0c3c54e67bb591cbad9500..eb39d29b39fa3e473f55ac5c557903447bfb8512 100644 (file)
--- a/arch/powerpc/dts/qoriq-fman3-1-10g-1.dtsi
+++ b/arch/powerpc/dts/qoriq-fman3-1-10g-1.dtsi
@@ -30,7 +30,7 @@ fman@500000 {
                pcsphy-handle = <&pcsphy15>;
        };
 
-       mdio@f3000 {
+       mdio@5f3000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-0.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-0.dtsi
index b4ff19bf495ae6ee0a2e2d9dab73657536998e40..2f2209dbc9bbb0797a2a889e501150b48851a522 100644 (file)
--- a/arch/powerpc/dts/qoriq-fman3-1-1g-0.dtsi
+++ b/arch/powerpc/dts/qoriq-fman3-1-1g-0.dtsi
@@ -29,7 +29,7 @@ fman@500000 {
                pcsphy-handle = <&pcsphy8>;
        };
 
-       mdio@e1000 {
+       mdio@5e1000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-1.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-1.dtsi
index 239c56ad1f621d7dbfed561ef014de6b93dca9c8..11653c58b5f01b0318cc638506357d341c4c75ec 100644 (file)
--- a/arch/powerpc/dts/qoriq-fman3-1-1g-1.dtsi
+++ b/arch/powerpc/dts/qoriq-fman3-1-1g-1.dtsi
@@ -29,7 +29,7 @@ fman@500000 {
                pcsphy-handle = <&pcsphy9>;
        };
 
-       mdio@e3000 {
+       mdio@5e3000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-2.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-2.dtsi
index 6e2bb009d9aaf3985431a3253967a380594bf337..ae27c7bc6df2eb0d95fcf736f765485604611579 100644 (file)
--- a/arch/powerpc/dts/qoriq-fman3-1-1g-2.dtsi
+++ b/arch/powerpc/dts/qoriq-fman3-1-1g-2.dtsi
@@ -29,7 +29,7 @@ fman@500000 {
                pcsphy-handle = <&pcsphy10>;
        };
 
-       mdio@e5000 {
+       mdio@5e5000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-3.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-3.dtsi
index 29dd94ba749886d49a2689fc7eb992554c90039f..55ae5499176e7b2c7a08b4030dfce7b2d1391633 100644 (file)
--- a/arch/powerpc/dts/qoriq-fman3-1-1g-3.dtsi
+++ b/arch/powerpc/dts/qoriq-fman3-1-1g-3.dtsi
@@ -29,7 +29,7 @@ fman@500000 {
                pcsphy-handle = <&pcsphy11>;
        };
 
-       mdio@e7000 {
+       mdio@5e7000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-4.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-4.dtsi
index a5b4935827034561f337cacc7fabf5237c3d582d..833cf3e23d8eaa109347bc5f0b0e664922c4a33e 100644 (file)
--- a/arch/powerpc/dts/qoriq-fman3-1-1g-4.dtsi
+++ b/arch/powerpc/dts/qoriq-fman3-1-1g-4.dtsi
@@ -29,7 +29,7 @@ fman@500000 {
                pcsphy-handle = <&pcsphy12>;
        };
 
-       mdio@e9000 {
+       mdio@5e9000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

diff --git a/arch/powerpc/dts/qoriq-fman3-1-1g-5.dtsi b/arch/powerpc/dts/qoriq-fman3-1-1g-5.dtsi
index 486c84bf98109811a88eb87fdb3c308fe4715108..81da55dfbe267791d56c1bc36f8be1cc3459c50e 100644 (file)
--- a/arch/powerpc/dts/qoriq-fman3-1-1g-5.dtsi
+++ b/arch/powerpc/dts/qoriq-fman3-1-1g-5.dtsi
@@ -29,7 +29,7 @@ fman@500000 {
                pcsphy-handle = <&pcsphy13>;
        };
 
-       mdio@eb000 {
+       mdio@5eb000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

diff --git a/arch/powerpc/dts/qoriq-fman3-1.dtsi b/arch/powerpc/dts/qoriq-fman3-1.dtsi
index d8609c3ecfdbd55e09488afb3e517f4cff4ffabd..9efcf26c4abc705cfc954d8e273970c9733471a8 100644 (file)
--- a/arch/powerpc/dts/qoriq-fman3-1.dtsi
+++ b/arch/powerpc/dts/qoriq-fman3-1.dtsi
@@ -61,14 +61,14 @@ fman1: fman@500000 {
                reg = <0x87000 0x1000>;
        };
 
-       mdio1: mdio@fc000 {
+       mdio1: mdio@5fc000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";
                reg = <0xfc000 0x1000>;
        };
 
-       mdio@fd000 {
+       mdio@5fd000 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

diff --git a/arch/powerpc/dts/t4240rdb.dts b/arch/powerpc/dts/t4240rdb.dts
index 6d31675c5eada6fd41acf4c8cce24d43c2c17cea..b3251e330de9375c663bff28b9d88abcf6114826 100644 (file)
--- a/arch/powerpc/dts/t4240rdb.dts
+++ b/arch/powerpc/dts/t4240rdb.dts
@@ -100,7 +100,7 @@
                        phy-connection-type = "xgmii";
                };
 
-               mdio@fc000 {
+               mdio@5fc000 {
                        sgmiiphy21: ethernet-phy@0 {
                                reg = <0x0>;
                        };
@@ -134,7 +134,7 @@
                        };
                };
 
-               mdio@fd000 {
+               mdio@5fd000 {
                        xfiphy1: ethernet-phy@10 {
                                compatible = "ethernet-phy-id13e5.1002";
                                reg = <0x10>;

diff --git a/arch/powerpc/dts/t4240si-post.dtsi b/arch/powerpc/dts/t4240si-post.dtsi
index f614d19965d304e0550a6017493411f06efd26bb..a596f48b54fef3ea6c1faa90e2d13c62bbcf92b9 100644 (file)
--- a/arch/powerpc/dts/t4240si-post.dtsi
+++ b/arch/powerpc/dts/t4240si-post.dtsi
@@ -90,11 +90,11 @@
                enet15: ethernet@f2000 {
                };
 
-               mdio@fc000 {
+               mdio@5fc000 {
                        interrupts = <100 1 0 0>;
                };
 
-               mdio@fd000 {
+               mdio@5fd000 {
                        interrupts = <101 1 0 0>;
                };
        };