]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
realtek: mdio: adjust naming of smi_bus_is_c45 22565/head
authorMarkus Stockhausen <markus.stockhausen@gmx.de>
Sun, 22 Mar 2026 14:46:33 +0000 (15:46 +0100)
committerRobert Marko <robimarko@gmail.com>
Mon, 23 Mar 2026 10:18:04 +0000 (11:18 +0100)
Rename smi_bus_isc45 to smi_bus_is_c45 for better readability.
Upstream uses same naming convention.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/22565
Signed-off-by: Robert Marko <robimarko@gmail.com>
target/linux/realtek/files-6.12/drivers/net/mdio/mdio-realtek-otto.c

index 363974d4f61ea83fdde3b20e07a19604479f7934..1b293c314181795a6703771eadb179f5cadefb76 100644 (file)
@@ -181,7 +181,7 @@ struct rtmdio_ctrl {
        int smi_bus[RTMDIO_MAX_PHY];
        int smi_addr[RTMDIO_MAX_PHY];
        struct device_node *phy_node[RTMDIO_MAX_PHY];
-       bool smi_bus_isc45[RTMDIO_MAX_SMI_BUS];
+       bool smi_bus_is_c45[RTMDIO_MAX_SMI_BUS];
        DECLARE_BITMAP(valid_ports, RTMDIO_MAX_PHY);
 };
 
@@ -707,7 +707,7 @@ static int rtmdio_930x_reset(struct mii_bus *bus)
        /* Define C22/C45 bus feature set */
        for (int addr = 0; addr < RTMDIO_MAX_SMI_BUS; addr++) {
                mask = BIT(16 + addr);
-               val = ctrl->smi_bus_isc45[addr] ? mask : 0;
+               val = ctrl->smi_bus_is_c45[addr] ? mask : 0;
                regmap_update_bits(ctrl->map, RTMDIO_930X_SMI_GLB_CTRL, mask, val);
        }
 
@@ -764,7 +764,7 @@ static int rtmdio_931x_reset(struct mii_bus *bus)
 
        /* Define C22/C45 bus feature set */
        for (int i = 0; i < RTMDIO_MAX_SMI_BUS; i++) {
-               if (ctrl->smi_bus_isc45[i])
+               if (ctrl->smi_bus_is_c45[i])
                        c45_mask |= 0x2 << (i * 2);  /* Std. C45, non-standard is 0x3 */
        }
        regmap_update_bits(ctrl->map, RTMDIO_931X_SMI_GLB_CTRL1, GENMASK(7, 0), c45_mask);
@@ -878,7 +878,7 @@ static int rtmdio_map_ports(struct device *dev)
                                             of_fwnode_handle(phy->parent));
 
                if (of_device_is_compatible(phy, "ethernet-phy-ieee802.3-c45"))
-                       ctrl->smi_bus_isc45[bus_addr] = true;
+                       ctrl->smi_bus_is_c45[bus_addr] = true;
 
                ctrl->smi_bus[addr] = bus_addr;
                ctrl->phy_node[addr] = of_node_get(phy);