realtek/rtl839x: respect phy-is-integrated property

Respect the phy-is-integrated property on ethernet-phy nodes.

There are RTL8393M switches where the PHYs at address 48 and 49 are
provided by an external RTL8214FC. Hardcoding them to use the internal
SerDes makes it impossible to use the ports connected to such an
external PHY. Respect the phy-is-integrated property on ethernet-phy
nodes as a first step to support such ports.

The potential impact for this should be limited to RTL8393 based
switches, and looking at the commit messages and device tree files of
the supported switches based on this SoC, the SFP and/or combo ports are
either not working (D-Link DGS-1210-52, Netgear GS750E, TP-Link
SG2452P/T1600G-52PS), use PHYs at a different address (Panasonic
SwitchM48EG PN28480K), or already have the phy-is-integrated property
set on the PHYs at address 48 and 49.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Acked-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/realtek/files-5.15/drivers/net/ethernet/rtl838x_eth.c b/target/linux/realtek/files-5.15/drivers/net/ethernet/rtl838x_eth.c
index 54e592aeaafa592037c30b6a2d701642df196002..71e7937336157ca13fa263c56f4d5da78329b2f3 100644 (file)
--- a/target/linux/realtek/files-5.15/drivers/net/ethernet/rtl838x_eth.c
+++ b/target/linux/realtek/files-5.15/drivers/net/ethernet/rtl838x_eth.c
@@ -1658,7 +1658,7 @@ static int rtl839x_mdio_read_paged(struct mii_bus *bus, int mii_id, u16 page, in
        int err;
        struct rtl838x_eth_priv *priv = bus->priv;
 
-       if (mii_id >= 48 && mii_id <= 49 && priv->id == 0x8393)
+       if (priv->phy_is_internal[mii_id])
                return rtl839x_read_sds_phy(mii_id, regnum);
 
        if (regnum & (MII_ADDR_C45 | MII_ADDR_C22_MMD)) {
@@ -1797,7 +1797,7 @@ static int rtl839x_mdio_write_paged(struct mii_bus *bus, int mii_id, u16 page,
        struct rtl838x_eth_priv *priv = bus->priv;
        int err;
 
-       if (mii_id >= 48 && mii_id <= 49 && priv->id == 0x8393)
+       if (priv->phy_is_internal[mii_id])
                return rtl839x_write_sds_phy(mii_id, regnum, value);
 
        if (regnum & (MII_ADDR_C45 | MII_ADDR_C22_MMD)) {