mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sky Huang <SkyLake.Huang@mediatek.com>
To: Andrew Lunn <andrew@lunn.ch>,
	Heiner Kallweit <hkallweit1@gmail.com>,
	Russell King <linux@armlinux.org.uk>,
	"David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
	Daniel Golle <daniel@makrotopia.org>,
	Qingfang Deng <dqfext@gmail.com>,
	SkyLake Huang <SkyLake.Huang@mediatek.com>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	AngeloGioacchino Del Regno
	<angelogioacchino.delregno@collabora.com>,
	<linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-mediatek@lists.infradead.org>
Cc: Steven Liu <Steven.Liu@mediatek.com>,
	SkyLake.Huang <skylake.huang@mediatek.com>
Subject: [PATCH net-next v10 07/13] net: phy: mediatek: add MT7530 & MT7531's PHY ID macros
Date: Mon, 1 Jul 2024 18:54:11 +0800	[thread overview]
Message-ID: <20240701105417.19941-8-SkyLake.Huang@mediatek.com> (raw)
In-Reply-To: <20240701105417.19941-1-SkyLake.Huang@mediatek.com>

From: "SkyLake.Huang" <skylake.huang@mediatek.com>

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>
---
Changes in v9:
- Remove ".led_hw_is_supported = mt753x_phy_led_hw_is_supported," in
  MT7530's callback function hooking of mtk-ge.c because it's
  mistakenly added.
---
 drivers/net/phy/mediatek/mtk-ge.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/mediatek/mtk-ge.c b/drivers/net/phy/mediatek/mtk-ge.c
index 161f2e8..b8a488c 100644
--- a/drivers/net/phy/mediatek/mtk-ge.c
+++ b/drivers/net/phy/mediatek/mtk-ge.c
@@ -5,6 +5,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
@@ -153,7 +156,7 @@ static int mt753x_phy_led_hw_control_set(struct phy_device *phydev, u8 index,
 
 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
@@ -167,7 +170,7 @@ static struct phy_driver mtk_gephy_driver[] = {
 		.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,
@@ -191,8 +194,8 @@ static struct phy_driver mtk_gephy_driver[] = {
 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) },
 	{ }
 };
 
-- 
2.18.0


  parent reply	other threads:[~2024-07-01 10:58 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-01 10:54 [PATCH net-next v10 00/13] net: phy: mediatek: Introduce mtk-phy-lib and add 2.5Gphy support Sky Huang
2024-07-01 10:54 ` [PATCH net-next v10 01/13] net: phy: mediatek: Re-organize MediaTek ethernet phy drivers Sky Huang
2024-07-01 10:54 ` [PATCH net-next v10 02/13] net: phy: mediatek: Fix spelling errors and rearrange variables Sky Huang
2024-07-01 10:54 ` [PATCH net-next v10 03/13] net: phy: mediatek: Move LED helper functions into mtk phy lib Sky Huang
2024-07-01 10:54 ` [PATCH net-next v10 04/13] net: phy: mediatek: Improve readability of mtk-phy-lib.c's mtk_phy_led_hw_ctrl_set() Sky Huang
2024-07-01 10:54 ` [PATCH net-next v10 05/13] net: phy: mediatek: Integrate read/write page helper functions Sky Huang
2024-07-01 10:54 ` [PATCH net-next v10 06/13] net: phy: mediatek: Hook LED helper functions in mtk-ge.c Sky Huang
2024-07-01 10:54 ` Sky Huang [this message]
2024-07-01 10:54 ` [PATCH net-next v10 08/13] net: phy: mediatek: Change mtk-ge-soc.c line wrapping Sky Huang
2024-07-01 10:54 ` [PATCH net-next v10 09/13] net: phy: mediatek: Add token ring access helper functions in mtk-phy-lib Sky Huang
2024-07-01 10:54 ` [PATCH net-next v10 10/13] net: phy: mediatek: Extend 1G TX/RX link pulse time Sky Huang
2024-07-01 10:54 ` [PATCH net-next v10 11/13] net: phy: add driver for built-in 2.5G ethernet PHY on MT7988 Sky Huang
2024-08-09 14:17   ` Andrew Lunn
2024-08-21  9:49     ` SkyLake Huang (黃啟澤)
2024-09-04  8:49       ` SkyLake Huang (黃啟澤)
2024-09-04  9:02         ` Daniel Golle
2024-07-01 10:54 ` [PATCH net-next v10 12/13] net: phy: mediatek: Fix alignment in callback functions' hook Sky Huang
2024-07-01 10:54 ` [PATCH net-next v10 13/13] net: phy: mediatek: Remove unnecessary outer parens of "supported_triggers" var Sky Huang
2024-07-01 11:20   ` Daniel Golle
2024-07-02  4:25     ` SkyLake Huang (黃啟澤)
2024-08-09 10:58 ` [PATCH net-next v10 00/13] net: phy: mediatek: Introduce mtk-phy-lib and add 2.5Gphy support SkyLake Huang (黃啟澤)
2024-08-09 14:07   ` Andrew Lunn
2024-08-21 23:26 ` Daniel Golle
2024-09-04  8:47   ` SkyLake Huang (黃啟澤)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240701105417.19941-8-SkyLake.Huang@mediatek.com \
    --to=skylake.huang@mediatek.com \
    --cc=Steven.Liu@mediatek.com \
    --cc=andrew@lunn.ch \
    --cc=angelogioacchino.delregno@collabora.com \
    --cc=daniel@makrotopia.org \
    --cc=davem@davemloft.net \
    --cc=dqfext@gmail.com \
    --cc=edumazet@google.com \
    --cc=hkallweit1@gmail.com \
    --cc=kuba@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux@armlinux.org.uk \
    --cc=matthias.bgg@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®