smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: phy: mv88e61xx: Convert to U_BOOT_PHY_DRIVER()

Browse Source 
Convert PHY driver to U_BOOT_PHY_DRIVER() macro and drop phy_register() init call.

Converted using sed
"s@^static struct phy_driver \(.*\)_driver = \+{@U_BOOT_PHY_DRIVER(\L\1) = {"

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Acked-by: Michal Simek <michal.simek@amd.com>
Tested-by: Michal Simek <michal.simek@amd.com> #microblaze (MANUAL_RELOC)
This commit is contained in:
Marek Vasut
2023-03-19 18:02:51 +01:00
parent 7e9ce5adf6
commit abdbfad25c
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/phy/mv88e61xx.c
View File

@@ -1127,7 +1127,7 @@ static int mv88e61xx_phy_startup(struct phy_device *phydev)
return 0; return 0;
} }
static struct phy_driver mv88e61xx_driver = { U_BOOT_PHY_DRIVER(mv88e61xx) = {
.name = "Marvell MV88E61xx", .name = "Marvell MV88E61xx",
.uid = 0x01410eb1, .uid = 0x01410eb1,
.mask = 0xfffffff0, .mask = 0xfffffff0,
@@ -1138,7 +1138,7 @@ static struct phy_driver mv88e61xx_driver = {
.shutdown = &genphy_shutdown, .shutdown = &genphy_shutdown,
}; };
static struct phy_driver mv88e609x_driver = { U_BOOT_PHY_DRIVER(mv88e609x) = {
.name = "Marvell MV88E609x", .name = "Marvell MV88E609x",
.uid = 0x1410c89, .uid = 0x1410c89,
.mask = 0xfffffff0, .mask = 0xfffffff0,
@@ -1149,7 +1149,7 @@ static struct phy_driver mv88e609x_driver = {
.shutdown = &genphy_shutdown, .shutdown = &genphy_shutdown,
}; };
static struct phy_driver mv88e6071_driver = { U_BOOT_PHY_DRIVER(mv88e6071) = {
.name = "Marvell MV88E6071", .name = "Marvell MV88E6071",
.uid = 0x1410db0, .uid = 0x1410db0,
.mask = 0xfffffff0, .mask = 0xfffffff0,
@@ -1160,15 +1160,6 @@ static struct phy_driver mv88e6071_driver = {
.shutdown = &genphy_shutdown, .shutdown = &genphy_shutdown,
}; };
int phy_mv88e61xx_init(void)
{
phy_register(&mv88e61xx_driver);
phy_register(&mv88e609x_driver);
phy_register(&mv88e6071_driver);
return 0;
}
/* /*
* Overload weak get_phy_id definition since we need non-standard functions * Overload weak get_phy_id definition since we need non-standard functions
* to read PHY registers * to read PHY registers

3
drivers/net/phy/phy.c
View File

@@ -514,9 +514,6 @@ int phy_init(void)
phy_drv_reloc(drv); phy_drv_reloc(drv);
#endif #endif
#ifdef CONFIG_MV88E61XX_SWITCH
phy_mv88e61xx_init();
#endif
#ifdef CONFIG_PHY_ET1011C #ifdef CONFIG_PHY_ET1011C
phy_et1011c_init(); phy_et1011c_init();
#endif #endif

1
include/phy.h
View File

@@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev);
int gen10g_shutdown(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev);
int gen10g_discover_mmds(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev);
int phy_mv88e61xx_init(void);
int phy_et1011c_init(void); int phy_et1011c_init(void);
int phy_lxt_init(void); int phy_lxt_init(void);
int phy_marvell_init(void); int phy_marvell_init(void);