[][kernel-6.6][mt7988][eth][Fix patch conflict issue]
[Description]
Fix patch conflict issue.
We need to remove this patch because it has been merged into the
OpenWrt master branch.
[Release-log]
N/A
Change-Id: I7103e79ca6b13cfdbf33976448f3e92272a3262a
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9840298
diff --git a/autobuild/unified/global/24.10/files/target/linux/mediatek/patches-6.6/999-2600-net-pcs-mtk_usxgmii-add-polarity-control.patch b/autobuild/unified/global/24.10/files/target/linux/mediatek/patches-6.6/999-2600-net-pcs-mtk_usxgmii-add-polarity-control.patch
deleted file mode 100644
index 349986c..0000000
--- a/autobuild/unified/global/24.10/files/target/linux/mediatek/patches-6.6/999-2600-net-pcs-mtk_usxgmii-add-polarity-control.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 7649f7f43c3008108f1a6070ac0d253391584952 Mon Sep 17 00:00:00 2001
-From: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
-Date: Tue, 29 Oct 2024 14:22:40 +0800
-Subject: [PATCH] net: pcs: mtk_usxgmii: add polarity control
-
----
- drivers/net/pcs/pcs-mtk-usxgmii.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/drivers/net/pcs/pcs-mtk-usxgmii.c b/drivers/net/pcs/pcs-mtk-usxgmii.c
-index 9af9035..9caab92 100644
---- a/drivers/net/pcs/pcs-mtk-usxgmii.c
-+++ b/drivers/net/pcs/pcs-mtk-usxgmii.c
-@@ -52,6 +52,12 @@
- #define USXGMII_LPA GENMASK(15, 0)
- #define USXGMII_LPA_LATCH BIT(31)
-
-+/* Register to control PCS polarity */
-+#define RG_PHY_TOP_CTRL0 0x82C
-+#define USXGMII_PN_SWAP_MASK GENMASK(1, 0)
-+#define USXGMII_PN_SWAP_RX BIT(1)
-+#define USXGMII_PN_SWAP_TX BIT(0)
-+
- /* Register to read PCS link status */
- #define RG_PCS_RX_STATUS0 0x904
- #define RG_PCS_RX_STATUS_UPDATE BIT(16)
-@@ -74,6 +80,7 @@ struct mtk_usxgmii_pcs {
- struct clk *clk;
- struct reset_control *reset;
- phy_interface_t interface;
-+ unsigned int polarity;
- unsigned int neg_mode;
- struct list_head node;
- };
-@@ -155,6 +162,10 @@ static int mtk_usxgmii_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode
-
- mtk_usxgmii_reset(mpcs);
-
-+ /* Configure the interface polarity */
-+ mtk_m32(mpcs, RG_PHY_TOP_CTRL0,
-+ USXGMII_PN_SWAP_MASK, mpcs->polarity);
-+
- /* Setup USXGMII AN ctrl */
- mtk_m32(mpcs, RG_PCS_AN_CTRL0,
- USXGMII_AN_SYNC_CNT | USXGMII_AN_ENABLE,
-@@ -332,6 +343,7 @@ static const struct phylink_pcs_ops mtk_usxgmii_pcs_ops = {
- static int mtk_usxgmii_probe(struct platform_device *pdev)
- {
- struct device *dev = &pdev->dev;
-+ struct device_node *np = dev->of_node;
- struct mtk_usxgmii_pcs *mpcs;
-
- mpcs = devm_kzalloc(dev, sizeof(*mpcs), GFP_KERNEL);
-@@ -342,6 +354,13 @@ static int mtk_usxgmii_probe(struct platform_device *pdev)
- if (IS_ERR(mpcs->base))
- return PTR_ERR(mpcs->base);
-
-+ if (of_property_read_bool(np->parent, "mediatek,pnswap"))
-+ mpcs->polarity = USXGMII_PN_SWAP_TX | USXGMII_PN_SWAP_RX;
-+ else if (of_property_read_bool(np, "mediatek,pn_swap_tx"))
-+ mpcs->polarity = USXGMII_PN_SWAP_TX;
-+ else if (of_property_read_bool(np, "mediatek,pn_swap_rx"))
-+ mpcs->polarity = USXGMII_PN_SWAP_RX;
-+
- mpcs->dev = dev;
- mpcs->pcs.ops = &mtk_usxgmii_pcs_ops;
- mpcs->pcs.poll = true;
---
-2.45.2
-