MIPS: mscc: ocelot: mark the phy-mode for internal PHY ports

The ocelot driver was converted to phylink, and that expects a valid
phy_interface_t. Without a phy-mode, of_get_phy_mode returns
PHY_INTERFACE_MODE_NA, which is not ideal because phylink rejects that.

The ocelot driver was patched to treat PHY_INTERFACE_MODE_NA as
PHY_INTERFACE_MODE_INTERNAL to work with the broken DT blobs, but we
should fix the device trees and specify the phy-mode too.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/boot/dts/mscc/ocelot_pcb120.dts b/arch/mips/boot/dts/mscc/ocelot_pcb120.dts
index d2dc6b3d923c9f27294d5bd94241086d46ca5f25..bd240690cb37edf208670c0de6825c6ab84d9a93 100644 (file)
--- a/arch/mips/boot/dts/mscc/ocelot_pcb120.dts
+++ b/arch/mips/boot/dts/mscc/ocelot_pcb120.dts
@@ -71,21 +71,25 @@
 &port0 {
        status = "okay";
        phy-handle = <&phy0>;
+       phy-mode = "internal";
 };
 
 &port1 {
        status = "okay";
        phy-handle = <&phy1>;
+       phy-mode = "internal";
 };
 
 &port2 {
        status = "okay";
        phy-handle = <&phy2>;
+       phy-mode = "internal";
 };
 
 &port3 {
        status = "okay";
        phy-handle = <&phy3>;
+       phy-mode = "internal";
 };
 
 &port4 {

diff --git a/arch/mips/boot/dts/mscc/ocelot_pcb123.dts b/arch/mips/boot/dts/mscc/ocelot_pcb123.dts
index 7d7e638791ddd776ae2b581cf1e8af7534eefe04..0185045c76309df8da4417bd91274d67b96ecf29 100644 (file)
--- a/arch/mips/boot/dts/mscc/ocelot_pcb123.dts
+++ b/arch/mips/boot/dts/mscc/ocelot_pcb123.dts
@@ -49,19 +49,23 @@
 &port0 {
        status = "okay";
        phy-handle = <&phy0>;
+       phy-mode = "internal";
 };
 
 &port1 {
        status = "okay";
        phy-handle = <&phy1>;
+       phy-mode = "internal";
 };
 
 &port2 {
        status = "okay";
        phy-handle = <&phy2>;
+       phy-mode = "internal";
 };
 
 &port3 {
        status = "okay";
        phy-handle = <&phy3>;
+       phy-mode = "internal";
 };