openwrt-mirror/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-12-21 17:04:28 +04:00
Code Issues Packages Projects Releases Wiki Activity

realtek: pcs: move polarity into SerDes struct

Browse Source 
As a first real usage of the new SerDes struct, move the polarity
configuration there. It was previously located in the global rtpcs_ctrl
struct as an array, indexed by SerDes id. Because this is per-SerDes
information, the new SerDes struct is the correct place to live in.

Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/21146
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Jonas Jelonek
2025-12-11 23:33:59 +00:00
committed by Robert Marko
parent 18eea05483
commit 56a71f3c82
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/realtek/files-6.12/drivers/net/pcs/pcs-rtl-otto.c
View File

@@ -135,6 +135,9 @@ struct rtpcs_serdes {
struct rtpcs_ctrl *ctrl; struct rtpcs_ctrl *ctrl;
u8 id; u8 id;
enum rtpcs_sds_mode mode; enum rtpcs_sds_mode mode;
bool rx_pol_inv;
bool tx_pol_inv;
}; };
struct rtpcs_ctrl { struct rtpcs_ctrl {
@@ -144,8 +147,6 @@ struct rtpcs_ctrl {
const struct rtpcs_config *cfg; const struct rtpcs_config *cfg;
struct rtpcs_serdes serdes[RTPCS_SDS_CNT]; struct rtpcs_serdes serdes[RTPCS_SDS_CNT];
struct rtpcs_link *link[RTPCS_PORT_CNT]; struct rtpcs_link *link[RTPCS_PORT_CNT];
bool rx_pol_inv[RTPCS_SDS_CNT];
bool tx_pol_inv[RTPCS_SDS_CNT];
struct mutex lock; struct mutex lock;
}; };
@@ -2242,8 +2243,7 @@ static int rtpcs_930x_setup_serdes(struct rtpcs_serdes *sds,
pr_info("%s: Configuring RTL9300 SERDES %d\n", __func__, sds->id); pr_info("%s: Configuring RTL9300 SERDES %d\n", __func__, sds->id);
/* Set SDS polarity */ /* Set SDS polarity */
rtpcs_930x_sds_set_polarity(sds, sds->ctrl->tx_pol_inv[sds->id], rtpcs_930x_sds_set_polarity(sds, sds->tx_pol_inv, sds->rx_pol_inv);
sds->ctrl->rx_pol_inv[sds->id]);
/* Enable SDS in desired mode */ /* Enable SDS in desired mode */
rtpcs_930x_sds_mode_set(sds, phy_mode); rtpcs_930x_sds_mode_set(sds, phy_mode);
@@ -2831,8 +2831,7 @@ static int rtpcs_931x_setup_serdes(struct rtpcs_serdes *sds,
} }
} }
rtpcs_931x_sds_set_polarity(sds, ctrl->tx_pol_inv[sds_id], rtpcs_931x_sds_set_polarity(sds, sds->tx_pol_inv, sds->rx_pol_inv);
ctrl->rx_pol_inv[sds_id]);
val = ori & ~BIT(sds_id); val = ori & ~BIT(sds_id);
regmap_write(ctrl->map, RTL931X_PS_SERDES_OFF_MODE_CTRL_ADDR, val); regmap_write(ctrl->map, RTL931X_PS_SERDES_OFF_MODE_CTRL_ADDR, val);
@@ -3090,8 +3089,9 @@ static int rtpcs_probe(struct platform_device *pdev)
if (sds_id >= ctrl->cfg->serdes_count) if (sds_id >= ctrl->cfg->serdes_count)
return -EINVAL; return -EINVAL;
ctrl->rx_pol_inv[sds_id] = of_property_read_bool(child, "realtek,pnswap-rx"); sds = &ctrl->serdes[sds_id];
ctrl->tx_pol_inv[sds_id] = of_property_read_bool(child, "realtek,pnswap-tx"); sds->rx_pol_inv = of_property_read_bool(child, "realtek,pnswap-rx");
sds->tx_pol_inv = of_property_read_bool(child, "realtek,pnswap-tx");
} }
if (ctrl->cfg->init_serdes_common) { if (ctrl->cfg->init_serdes_common) {