realtek: mdio: setup polling for RTL8261

Startup of mdio on a RTL8216 based device currently shows the
following warnings.

[1.948608] skip polling setup for unknown PHY 001ccaf3 on port 0
[1.968920] skip polling setup for unknown PHY 001ccaf3 on port 8
[1.989171] skip polling setup for unknown PHY 001ccaf3 on port 16
[2.009704] skip polling setup for unknown PHY 001ccaf3 on port 20
[2.030209] skip polling setup for unknown PHY 001ccaf3 on port 24
[2.052270] realtek-otto-serdes-mdio 1b000000.switchcore:mdio-serdes:
           Realtek SerDes mdio bus initialized, 12 SerDes, 64 pages

Add the phy detection to the mdio bus so that polling setup works.
While we are here sort the phy ids alphabetically.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/22109
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c b/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
index e38f98914e5372c72e2231739cdb94e772b08c10..a0919cca48fc0ecb5899dfdbcbbf512621e127ba 100644 (file)
--- a/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
+++ b/target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c
@@ -16,12 +16,13 @@
 #define RTMDIO_PHY_AQR113C_A                   0x31c31c12
 #define RTMDIO_PHY_AQR113C_B                   0x31c31c13
 #define RTMDIO_PHY_AQR813                      0x31c31cb2
+#define RTMDIO_PHY_RTL8218D                    0x001cc983
+#define RTMDIO_PHY_RTL8218E                    0x001cc984
 #define RTMDIO_PHY_RTL8221B_VB_CG              0x001cc849
 #define RTMDIO_PHY_RTL8221B_VM_CG              0x001cc84a
 #define RTMDIO_PHY_RTL8224                     0x001ccad0
 #define RTMDIO_PHY_RTL8226                     0x001cc838
-#define RTMDIO_PHY_RTL8218D                    0x001cc983
-#define RTMDIO_PHY_RTL8218E                    0x001cc984
+#define RTMDIO_PHY_RTL8261                     0x001ccaf3
 
 #define RTMDIO_PHY_MAC_1G                      3
 #define RTMDIO_PHY_MAC_2G_PLUS                 1
@@ -637,6 +638,11 @@ static int rtmdio_get_phy_info(struct mii_bus *bus, int addr, struct rtmdio_phy_
                phyinfo->poll_adv_1000 = RTMDIO_PHY_POLL_MMD(31, 0xa412, 9);
                phyinfo->poll_lpa_1000 = RTMDIO_PHY_POLL_MMD(31, 0xa414, 11);
                break;
+       case RTMDIO_PHY_RTL8261:
+               phyinfo->mac_type = RTMDIO_PHY_MAC_2G_PLUS;
+               phyinfo->has_giga_lite = true;
+               phyinfo->has_res_reg = true;
+               break;
        default:
                pr_warn("skip polling setup for unknown PHY %08x on port %d\n", phyid, addr);
                ret = -EINVAL;