aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut+renesas@mailbox.org>2023-03-19 18:02:51 +0100
committerMarek Vasut <marek.vasut+renesas@mailbox.org>2023-04-07 14:18:49 +0200
commitabdbfad25c3712b5d0e8ccc514f85eed8aba7b20 (patch)
treeba52cf20cd91ae7d2b42b9a385a2031dc42ce850 /drivers/net/phy
parent7e9ce5adf6ff14cc051fd9fe11107cd6ce0ba0ef (diff)
downloadu-boot-abdbfad25c3712b5d0e8ccc514f85eed8aba7b20.zip
u-boot-abdbfad25c3712b5d0e8ccc514f85eed8aba7b20.tar.gz
u-boot-abdbfad25c3712b5d0e8ccc514f85eed8aba7b20.tar.bz2
net: phy: mv88e61xx: Convert to U_BOOT_PHY_DRIVER()
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)
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/mv88e61xx.c15
-rw-r--r--drivers/net/phy/phy.c3
2 files changed, 3 insertions, 15 deletions
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c
index 7ab6016..8577810 100644
--- a/drivers/net/phy/mv88e61xx.c
+++ b/drivers/net/phy/mv88e61xx.c
@@ -1127,7 +1127,7 @@ static int mv88e61xx_phy_startup(struct phy_device *phydev)
return 0;
}
-static struct phy_driver mv88e61xx_driver = {
+U_BOOT_PHY_DRIVER(mv88e61xx) = {
.name = "Marvell MV88E61xx",
.uid = 0x01410eb1,
.mask = 0xfffffff0,
@@ -1138,7 +1138,7 @@ static struct phy_driver mv88e61xx_driver = {
.shutdown = &genphy_shutdown,
};
-static struct phy_driver mv88e609x_driver = {
+U_BOOT_PHY_DRIVER(mv88e609x) = {
.name = "Marvell MV88E609x",
.uid = 0x1410c89,
.mask = 0xfffffff0,
@@ -1149,7 +1149,7 @@ static struct phy_driver mv88e609x_driver = {
.shutdown = &genphy_shutdown,
};
-static struct phy_driver mv88e6071_driver = {
+U_BOOT_PHY_DRIVER(mv88e6071) = {
.name = "Marvell MV88E6071",
.uid = 0x1410db0,
.mask = 0xfffffff0,
@@ -1160,15 +1160,6 @@ static struct phy_driver mv88e6071_driver = {
.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
* to read PHY registers
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 6d7e07c..7312719 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -514,9 +514,6 @@ int phy_init(void)
phy_drv_reloc(drv);
#endif
-#ifdef CONFIG_MV88E61XX_SWITCH
- phy_mv88e61xx_init();
-#endif
#ifdef CONFIG_PHY_ET1011C
phy_et1011c_init();
#endif