mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
1069514978
Use pending patchset for 2.5GE PHY driver, unifying LED handling accross all MediaTek Ethernet PHYs. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
131 lines
4.9 KiB
Diff
131 lines
4.9 KiB
Diff
From 07e90eb1819319a0c34b0cf3a57a4a3878e96e4d Mon Sep 17 00:00:00 2001
|
|
From: "SkyLake.Huang" <skylake.huang@mediatek.com>
|
|
Date: Mon, 1 Jul 2024 18:54:16 +0800
|
|
Subject: [PATCH 12/13] net: phy: mediatek: Fix alignment in callback
|
|
functions' hook
|
|
|
|
Align declarations in mtk_gephy_driver(mtk-ge.c) and
|
|
mtk_socphy_driver(mtk-ge-soc.c). At first, some of them are
|
|
".foo<tab>= method_foo", and others are ".bar<space>= method_bar".
|
|
Use space instead for all of them here in case line is longer than
|
|
80 chars.
|
|
|
|
Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
|
---
|
|
drivers/net/phy/mediatek/mtk-ge-soc.c | 40 +++++++++++++--------------
|
|
drivers/net/phy/mediatek/mtk-ge.c | 34 +++++++++++------------
|
|
2 files changed, 37 insertions(+), 37 deletions(-)
|
|
|
|
--- a/drivers/net/phy/mediatek/mtk-ge-soc.c
|
|
+++ b/drivers/net/phy/mediatek/mtk-ge-soc.c
|
|
@@ -1394,17 +1394,17 @@ static int mt7981_phy_probe(struct phy_d
|
|
static struct phy_driver mtk_socphy_driver[] = {
|
|
{
|
|
PHY_ID_MATCH_EXACT(MTK_GPHY_ID_MT7981),
|
|
- .name = "MediaTek MT7981 PHY",
|
|
- .config_init = mt798x_phy_config_init,
|
|
- .read_status = mtk_gphy_cl22_read_status,
|
|
- .config_intr = genphy_no_config_intr,
|
|
+ .name = "MediaTek MT7981 PHY",
|
|
+ .config_init = mt798x_phy_config_init,
|
|
+ .read_status = mtk_gphy_cl22_read_status,
|
|
+ .config_intr = genphy_no_config_intr,
|
|
.handle_interrupt = genphy_handle_interrupt_no_ack,
|
|
- .probe = mt7981_phy_probe,
|
|
- .suspend = genphy_suspend,
|
|
- .resume = genphy_resume,
|
|
- .read_page = mtk_phy_read_page,
|
|
- .write_page = mtk_phy_write_page,
|
|
- .led_blink_set = mt798x_phy_led_blink_set,
|
|
+ .probe = mt7981_phy_probe,
|
|
+ .suspend = genphy_suspend,
|
|
+ .resume = genphy_resume,
|
|
+ .read_page = mtk_phy_read_page,
|
|
+ .write_page = mtk_phy_write_page,
|
|
+ .led_blink_set = mt798x_phy_led_blink_set,
|
|
.led_brightness_set = mt798x_phy_led_brightness_set,
|
|
.led_hw_is_supported = mt798x_phy_led_hw_is_supported,
|
|
.led_hw_control_set = mt798x_phy_led_hw_control_set,
|
|
@@ -1412,17 +1412,17 @@ static struct phy_driver mtk_socphy_driv
|
|
},
|
|
{
|
|
PHY_ID_MATCH_EXACT(MTK_GPHY_ID_MT7988),
|
|
- .name = "MediaTek MT7988 PHY",
|
|
- .config_init = mt798x_phy_config_init,
|
|
- .read_status = mtk_gphy_cl22_read_status,
|
|
- .config_intr = genphy_no_config_intr,
|
|
+ .name = "MediaTek MT7988 PHY",
|
|
+ .config_init = mt798x_phy_config_init,
|
|
+ .read_status = mtk_gphy_cl22_read_status,
|
|
+ .config_intr = genphy_no_config_intr,
|
|
.handle_interrupt = genphy_handle_interrupt_no_ack,
|
|
- .probe = mt7988_phy_probe,
|
|
- .suspend = genphy_suspend,
|
|
- .resume = genphy_resume,
|
|
- .read_page = mtk_phy_read_page,
|
|
- .write_page = mtk_phy_write_page,
|
|
- .led_blink_set = mt798x_phy_led_blink_set,
|
|
+ .probe = mt7988_phy_probe,
|
|
+ .suspend = genphy_suspend,
|
|
+ .resume = genphy_resume,
|
|
+ .read_page = mtk_phy_read_page,
|
|
+ .write_page = mtk_phy_write_page,
|
|
+ .led_blink_set = mt798x_phy_led_blink_set,
|
|
.led_brightness_set = mt798x_phy_led_brightness_set,
|
|
.led_hw_is_supported = mt798x_phy_led_hw_is_supported,
|
|
.led_hw_control_set = mt798x_phy_led_hw_control_set,
|
|
--- a/drivers/net/phy/mediatek/mtk-ge.c
|
|
+++ b/drivers/net/phy/mediatek/mtk-ge.c
|
|
@@ -230,34 +230,34 @@ static int mt753x_phy_led_hw_control_set
|
|
static struct phy_driver mtk_gephy_driver[] = {
|
|
{
|
|
PHY_ID_MATCH_EXACT(MTK_GPHY_ID_MT7530),
|
|
- .name = "MediaTek MT7530 PHY",
|
|
- .config_init = mt7530_phy_config_init,
|
|
+ .name = "MediaTek MT7530 PHY",
|
|
+ .config_init = mt7530_phy_config_init,
|
|
/* Interrupts are handled by the switch, not the PHY
|
|
* itself.
|
|
*/
|
|
- .config_intr = genphy_no_config_intr,
|
|
+ .config_intr = genphy_no_config_intr,
|
|
.handle_interrupt = genphy_handle_interrupt_no_ack,
|
|
- .suspend = genphy_suspend,
|
|
- .resume = genphy_resume,
|
|
- .read_page = mtk_phy_read_page,
|
|
- .write_page = mtk_phy_write_page,
|
|
+ .suspend = genphy_suspend,
|
|
+ .resume = genphy_resume,
|
|
+ .read_page = mtk_phy_read_page,
|
|
+ .write_page = mtk_phy_write_page,
|
|
},
|
|
{
|
|
PHY_ID_MATCH_EXACT(MTK_GPHY_ID_MT7531),
|
|
- .name = "MediaTek MT7531 PHY",
|
|
- .probe = mt7531_phy_probe,
|
|
- .config_init = mt7531_phy_config_init,
|
|
- .read_status = mtk_gphy_cl22_read_status,
|
|
+ .name = "MediaTek MT7531 PHY",
|
|
+ .probe = mt7531_phy_probe,
|
|
+ .config_init = mt7531_phy_config_init,
|
|
+ .read_status = mtk_gphy_cl22_read_status,
|
|
/* Interrupts are handled by the switch, not the PHY
|
|
* itself.
|
|
*/
|
|
- .config_intr = genphy_no_config_intr,
|
|
+ .config_intr = genphy_no_config_intr,
|
|
.handle_interrupt = genphy_handle_interrupt_no_ack,
|
|
- .suspend = genphy_suspend,
|
|
- .resume = genphy_resume,
|
|
- .read_page = mtk_phy_read_page,
|
|
- .write_page = mtk_phy_write_page,
|
|
- .led_blink_set = mt753x_phy_led_blink_set,
|
|
+ .suspend = genphy_suspend,
|
|
+ .resume = genphy_resume,
|
|
+ .read_page = mtk_phy_read_page,
|
|
+ .write_page = mtk_phy_write_page,
|
|
+ .led_blink_set = mt753x_phy_led_blink_set,
|
|
.led_brightness_set = mt753x_phy_led_brightness_set,
|
|
.led_hw_is_supported = mt753x_phy_led_hw_is_supported,
|
|
.led_hw_control_set = mt753x_phy_led_hw_control_set,
|