powerpc: dts: qoriq: Add nodes for QSGMII PCSs

Now that we actually read registers from QSGMII PCSs, it's important
that we have the correct address (instead of hoping that we're the MAC
with all the QSGMII PCSs on its bus). This adds nodes for the QSGMII
PCSs. They have the same addresses on all SoCs (e.g. if QSGMIIA is
present it's used for MACs 1 through 4).

Since the first QSGMII PCSs share an address with the SGMII and XFI
PCSs, we only add new nodes for PCSs 2-4. This avoids address conflicts
on the bus.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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 baa0c503e741b87f89609ca66c907fd5b36ecea7..7e70977f282a39c9070e9db344cb684e100121e0 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
@@ -55,7 +55,8 @@ ethernet@e0000 {
                reg = <0xe0000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;
                ptp-timer = <&ptp_timer0>;
-               pcsphy-handle = <&pcsphy0>;
+               pcsphy-handle = <&pcsphy0>, <&pcsphy0>;
+               pcs-handle-names = "sgmii", "qsgmii";
        };
 
        mdio@e1000 {

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 93095600e8086f617b515047a4c70275d1cf88f8..5f89f7c1761faf7c684edcd9f570e137733246e7 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
@@ -52,7 +52,15 @@ ethernet@f0000 {
                compatible = "fsl,fman-memac";
                reg = <0xf0000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x10 &fman0_tx_0x30>;
-               pcsphy-handle = <&pcsphy6>;
+               pcsphy-handle = <&pcsphy6>, <&qsgmiib_pcs2>, <&pcsphy6>;
+               pcs-handle-names = "sgmii", "qsgmii", "xfi";
+       };
+
+       mdio@e9000 {
+               qsgmiib_pcs2: ethernet-pcs@2 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <2>;
+               };
        };
 
        mdio@f1000 {

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 ff4bd38f064599947096249e51149f8a0e43383f..71eb75e82c2e1cfe35ae2d61c99c1f2653ff1070 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
@@ -55,7 +55,15 @@ ethernet@e2000 {
                reg = <0xe2000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;
                ptp-timer = <&ptp_timer0>;
-               pcsphy-handle = <&pcsphy1>;
+               pcsphy-handle = <&pcsphy1>, <&qsgmiia_pcs1>;
+               pcs-handle-names = "sgmii", "qsgmii";
+       };
+
+       mdio@e1000 {
+               qsgmiia_pcs1: ethernet-pcs@1 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <1>;
+               };
        };
 
        mdio@e3000 {

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 1fa38ed6f59e269c70a6de0e8ca41d40024bcb62..fb7032ddb7fc41a22392bc12035540a9bef616f0 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
@@ -52,7 +52,15 @@ ethernet@f2000 {
                compatible = "fsl,fman-memac";
                reg = <0xf2000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x11 &fman0_tx_0x31>;
-               pcsphy-handle = <&pcsphy7>;
+               pcsphy-handle = <&pcsphy7>, <&qsgmiib_pcs3>, <&pcsphy7>;
+               pcs-handle-names = "sgmii", "qsgmii", "xfi";
+       };
+
+       mdio@e9000 {
+               qsgmiib_pcs3: ethernet-pcs@3 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <3>;
+               };
        };
 
        mdio@f3000 {

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
index 437dab3fc017699d4e3981370f47fee464d6a958..6b3609574b0fecf0dbeafd10cc6f44932b00f813 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi
@@ -27,7 +27,8 @@ ethernet@e0000 {
                reg = <0xe0000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;
                ptp-timer = <&ptp_timer0>;
-               pcsphy-handle = <&pcsphy0>;
+               pcsphy-handle = <&pcsphy0>, <&pcsphy0>;
+               pcs-handle-names = "sgmii", "xfi";
        };
 
        mdio@e1000 {

diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
index ad116b17850a8b9e6a23848c532f97c60e8fd7ec..28ed1a85a4363166d0e26b9d747278d73f65110d 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
+++ b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi
@@ -27,7 +27,8 @@ ethernet@e2000 {
                reg = <0xe2000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;
                ptp-timer = <&ptp_timer0>;
-               pcsphy-handle = <&pcsphy1>;
+               pcsphy-handle = <&pcsphy1>, <&pcsphy1>;
+               pcs-handle-names = "sgmii", "xfi";
        };
 
        mdio@e3000 {

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 a8cc9780c0c4225ac48c3fba7ca096089bf1c2f3..1089d6861bfb052e8ba76ce4989937169e1d3930 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
@@ -51,7 +51,8 @@ ethernet@e0000 {
                reg = <0xe0000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;
                ptp-timer = <&ptp_timer0>;
-               pcsphy-handle = <&pcsphy0>;
+               pcsphy-handle = <&pcsphy0>, <&pcsphy0>;
+               pcs-handle-names = "sgmii", "qsgmii";
        };
 
        mdio@e1000 {

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 8b8bd70c93823df4ca8fc71574f6e9417c7bf1cb..a95bbb4fc827fdf8714d99bb95159c17a3cddef6 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
@@ -51,7 +51,15 @@ ethernet@e2000 {
                reg = <0xe2000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;
                ptp-timer = <&ptp_timer0>;
-               pcsphy-handle = <&pcsphy1>;
+               pcsphy-handle = <&pcsphy1>, <&qsgmiia_pcs1>;
+               pcs-handle-names = "sgmii", "qsgmii";
+       };
+
+       mdio@e1000 {
+               qsgmiia_pcs1: ethernet-pcs@1 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <1>;
+               };
        };
 
        mdio@e3000 {

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 619c880b54d8d39202cb58579974992ef2bf919f..7d5af0147a250105893fc0505553741a0a83752d 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
@@ -51,7 +51,15 @@ ethernet@e4000 {
                reg = <0xe4000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x0a &fman0_tx_0x2a>;
                ptp-timer = <&ptp_timer0>;
-               pcsphy-handle = <&pcsphy2>;
+               pcsphy-handle = <&pcsphy2>, <&qsgmiia_pcs2>;
+               pcs-handle-names = "sgmii", "qsgmii";
+       };
+
+       mdio@e1000 {
+               qsgmiia_pcs2: ethernet-pcs@2 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <2>;
+               };
        };
 
        mdio@e5000 {

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 d7ebb73a400d06978aaedadd2efd62770159393c..61e5466ec854849c5d89d0cb988d8e35c6486401 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
@@ -51,7 +51,15 @@ ethernet@e6000 {
                reg = <0xe6000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x0b &fman0_tx_0x2b>;
                ptp-timer = <&ptp_timer0>;
-               pcsphy-handle = <&pcsphy3>;
+               pcsphy-handle = <&pcsphy3>, <&qsgmiia_pcs3>;
+               pcs-handle-names = "sgmii", "qsgmii";
+       };
+
+       mdio@e1000 {
+               qsgmiia_pcs3: ethernet-pcs@3 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <3>;
+               };
        };
 
        mdio@e7000 {

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 b151d696a0699b24e90a5c290dba6cc41e6acccf..3ba0cdafc0694974b246cc6747d862b113d4e1fb 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
@@ -51,7 +51,8 @@ ethernet@e8000 {
                reg = <0xe8000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x0c &fman0_tx_0x2c>;
                ptp-timer = <&ptp_timer0>;
-               pcsphy-handle = <&pcsphy4>;
+               pcsphy-handle = <&pcsphy4>, <&pcsphy4>;
+               pcs-handle-names = "sgmii", "qsgmii";
        };
 
        mdio@e9000 {

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 adc0ae0013a3ce89f8d1e26bd14a6f6f15af4526..51748de0a289f31f2f0fef39ad8023dea864fb81 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
@@ -51,7 +51,15 @@ ethernet@ea000 {
                reg = <0xea000 0x1000>;
                fsl,fman-ports = <&fman0_rx_0x0d &fman0_tx_0x2d>;
                ptp-timer = <&ptp_timer0>;
-               pcsphy-handle = <&pcsphy5>;
+               pcsphy-handle = <&pcsphy5>, <&qsgmiib_pcs1>;
+               pcs-handle-names = "sgmii", "qsgmii";
+       };
+
+       mdio@e9000 {
+               qsgmiib_pcs1: ethernet-pcs@1 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <1>;
+               };
        };
 
        mdio@eb000 {

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 435047e0e250e2e95d73d0e3de6b605060beb378..ee4f5170f632d4498913cb14bc356f31c2ea77aa 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
@@ -52,7 +52,15 @@ ethernet@f0000 {
                compatible = "fsl,fman-memac";
                reg = <0xf0000 0x1000>;
                fsl,fman-ports = <&fman1_rx_0x10 &fman1_tx_0x30>;
-               pcsphy-handle = <&pcsphy14>;
+               pcsphy-handle = <&pcsphy14>, <&qsgmiid_pcs2>, <&pcsphy14>;
+               pcs-handle-names = "sgmii", "qsgmii", "xfi";
+       };
+
+       mdio@e9000 {
+               qsgmiid_pcs2: ethernet-pcs@2 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <2>;
+               };
        };
 
        mdio@f1000 {

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 c098657cca0a7b8330590ef69b129af4b06b8e4d..83d2e0ce8f7b5a779947827347af7479a83453c6 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
@@ -52,7 +52,15 @@ ethernet@f2000 {
                compatible = "fsl,fman-memac";
                reg = <0xf2000 0x1000>;
                fsl,fman-ports = <&fman1_rx_0x11 &fman1_tx_0x31>;
-               pcsphy-handle = <&pcsphy15>;
+               pcsphy-handle = <&pcsphy15>, <&qsgmiid_pcs3>, <&pcsphy15>;
+               pcs-handle-names = "sgmii", "qsgmii", "xfi";
+       };
+
+       mdio@e9000 {
+               qsgmiid_pcs3: ethernet-pcs@3 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <3>;
+               };
        };
 
        mdio@f3000 {

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 9d06824815f342ca7b1d30c5e94159da76e936e9..3132fc73f1339c459c1098bb025abcb9685a489b 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
@@ -51,7 +51,8 @@ ethernet@e0000 {
                reg = <0xe0000 0x1000>;
                fsl,fman-ports = <&fman1_rx_0x08 &fman1_tx_0x28>;
                ptp-timer = <&ptp_timer1>;
-               pcsphy-handle = <&pcsphy8>;
+               pcsphy-handle = <&pcsphy8>, <&pcsphy8>;
+               pcs-handle-names = "sgmii", "qsgmii";
        };
 
        mdio@e1000 {

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 70e947730c4ba72b715763fb1fe2ddf6c6ef0fec..75e904d96602cefa1a46cb07df6a917d1fe3e1ef 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
@@ -51,7 +51,15 @@ ethernet@e2000 {
                reg = <0xe2000 0x1000>;
                fsl,fman-ports = <&fman1_rx_0x09 &fman1_tx_0x29>;
                ptp-timer = <&ptp_timer1>;
-               pcsphy-handle = <&pcsphy9>;
+               pcsphy-handle = <&pcsphy9>, <&qsgmiic_pcs1>;
+               pcs-handle-names = "sgmii", "qsgmii";
+       };
+
+       mdio@e1000 {
+               qsgmiic_pcs1: ethernet-pcs@1 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <1>;
+               };
        };
 
        mdio@e3000 {

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 ad96e6529595960f14be688feee58d3e3a6b84e9..69f2cc7b8f1994449da12b8afac5ab5a5645d10d 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
@@ -51,7 +51,15 @@ ethernet@e4000 {
                reg = <0xe4000 0x1000>;
                fsl,fman-ports = <&fman1_rx_0x0a &fman1_tx_0x2a>;
                ptp-timer = <&ptp_timer1>;
-               pcsphy-handle = <&pcsphy10>;
+               pcsphy-handle = <&pcsphy10>, <&qsgmiic_pcs2>;
+               pcs-handle-names = "sgmii", "qsgmii";
+       };
+
+       mdio@e1000 {
+               qsgmiic_pcs2: ethernet-pcs@2 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <2>;
+               };
        };
 
        mdio@e5000 {

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 034bc4b71f7a506a064b37c320beea2bedd0f390..b3aaf01d7da0d3b482bf74c0de50397d54b72c43 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
@@ -51,7 +51,15 @@ ethernet@e6000 {
                reg = <0xe6000 0x1000>;
                fsl,fman-ports = <&fman1_rx_0x0b &fman1_tx_0x2b>;
                ptp-timer = <&ptp_timer1>;
-               pcsphy-handle = <&pcsphy11>;
+               pcsphy-handle = <&pcsphy11>, <&qsgmiic_pcs3>;
+               pcs-handle-names = "sgmii", "qsgmii";
+       };
+
+       mdio@e1000 {
+               qsgmiic_pcs3: ethernet-pcs@3 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <3>;
+               };
        };
 
        mdio@e7000 {

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 93ca23d82b39ba9cfdf0558afe1da18d0518550d..18e0204328070b168eebb0f197957080bcde6458 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
@@ -51,7 +51,8 @@ ethernet@e8000 {
                reg = <0xe8000 0x1000>;
                fsl,fman-ports = <&fman1_rx_0x0c &fman1_tx_0x2c>;
                ptp-timer = <&ptp_timer1>;
-               pcsphy-handle = <&pcsphy12>;
+               pcsphy-handle = <&pcsphy12>, <&pcsphy12>;
+               pcs-handle-names = "sgmii", "qsgmii";
        };
 
        mdio@e9000 {

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 23b3117a2fd2a3871627bc34a68e14d0159e52ca..55f329d13f198d65f3e6345924dda4bec4d46439 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
@@ -51,7 +51,15 @@ ethernet@ea000 {
                reg = <0xea000 0x1000>;
                fsl,fman-ports = <&fman1_rx_0x0d &fman1_tx_0x2d>;
                ptp-timer = <&ptp_timer1>;
-               pcsphy-handle = <&pcsphy13>;
+               pcsphy-handle = <&pcsphy13>, <&qsgmiid_pcs1>;
+               pcs-handle-names = "sgmii", "qsgmii";
+       };
+
+       mdio@e9000 {
+               qsgmiid_pcs1: ethernet-pcs@1 {
+                       compatible = "fsl,lynx-pcs";
+                       reg = <1>;
+               };
        };
 
        mdio@eb000 {