mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
7d256aff7b
The previous iteration of MediaTek's PHY patches caused various weird bugs. Drop culprit patch 733-10-net-phy-mediatek-Extend-1G-TX-RX-link-pulse-time.patch and use the most recent iteration of the patchset which has been posted to the netdev mailing list. Link: https://patchwork.kernel.org/project/netdevbpf/list/?series=895513&state=* Fixes: #16448 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From c5ff7bece642dbba601be89e70f78ff037ca084f Mon Sep 17 00:00:00 2001
|
|
From: "SkyLake.Huang" <skylake.huang@mediatek.com>
|
|
Date: Fri, 4 Oct 2024 18:24:11 +0800
|
|
Subject: [PATCH 7/9] net: phy: mediatek: add MT7530 & MT7531's PHY ID macros
|
|
|
|
This patch adds MT7530 & MT7531's PHY ID macros in mtk-ge.c so that
|
|
it follows the same rule of mtk-ge-soc.c.
|
|
|
|
Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
|
---
|
|
drivers/net/phy/mediatek/mtk-ge.c | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/phy/mediatek/mtk-ge.c
|
|
+++ b/drivers/net/phy/mediatek/mtk-ge.c
|
|
@@ -6,6 +6,9 @@
|
|
|
|
#include "mtk.h"
|
|
|
|
+#define MTK_GPHY_ID_MT7530 0x03a29412
|
|
+#define MTK_GPHY_ID_MT7531 0x03a29441
|
|
+
|
|
#define MTK_EXT_PAGE_ACCESS 0x1f
|
|
#define MTK_PHY_PAGE_STANDARD 0x0000
|
|
#define MTK_PHY_PAGE_EXTENDED 0x0001
|
|
@@ -190,7 +193,7 @@ static int mt753x_phy_led_hw_control_set
|
|
|
|
static struct phy_driver mtk_gephy_driver[] = {
|
|
{
|
|
- PHY_ID_MATCH_EXACT(0x03a29412),
|
|
+ PHY_ID_MATCH_EXACT(MTK_GPHY_ID_MT7530),
|
|
.name = "MediaTek MT7530 PHY",
|
|
.config_init = mt7530_phy_config_init,
|
|
/* Interrupts are handled by the switch, not the PHY
|
|
@@ -204,7 +207,7 @@ static struct phy_driver mtk_gephy_drive
|
|
.write_page = mtk_phy_write_page,
|
|
},
|
|
{
|
|
- PHY_ID_MATCH_EXACT(0x03a29441),
|
|
+ PHY_ID_MATCH_EXACT(MTK_GPHY_ID_MT7531),
|
|
.name = "MediaTek MT7531 PHY",
|
|
.probe = mt7531_phy_probe,
|
|
.config_init = mt7531_phy_config_init,
|
|
@@ -228,8 +231,8 @@ static struct phy_driver mtk_gephy_drive
|
|
module_phy_driver(mtk_gephy_driver);
|
|
|
|
static struct mdio_device_id __maybe_unused mtk_gephy_tbl[] = {
|
|
- { PHY_ID_MATCH_EXACT(0x03a29441) },
|
|
- { PHY_ID_MATCH_EXACT(0x03a29412) },
|
|
+ { PHY_ID_MATCH_EXACT(MTK_GPHY_ID_MT7530) },
|
|
+ { PHY_ID_MATCH_EXACT(MTK_GPHY_ID_MT7531) },
|
|
{ }
|
|
};
|
|
|