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 --- Cc: "Ariel D'Alessandro" ariel.dalessandro@collabora.com Cc: "Cédric Le Goater" clg@kaod.org Cc: "Marek Behún" kabel@kernel.org Cc: Alex Nemirovsky alex.nemirovsky@cortina-access.com Cc: Haolin Li li.haolin@qq.com Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Joe Hershberger joe.hershberger@ni.com Cc: Joel Stanley joel@jms.id.au Cc: Josua Mayer josua@solid-run.com Cc: Marek Vasut marek.vasut+renesas@mailbox.org Cc: Michael Trimarchi michael@amarulasolutions.com Cc: Michal Simek michal.simek@amd.com Cc: Nate Drude nate.d@variscite.com Cc: Neil Armstrong neil.armstrong@linaro.org Cc: Radu Pirea radu-nicolae.pirea@oss.nxp.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Samuel Mendoza-Jonas sam@mendozajonas.com Cc: Stefan Roese sr@denx.de Cc: T Karthik Reddy t.karthik.reddy@xilinx.com Cc: Tim Harvey tharvey@gateworks.com Cc: Vladimir Oltean vladimir.oltean@nxp.com Cc: u-boot-amlogic@groups.io --- drivers/net/phy/marvell.c | 39 +++++++++++---------------------------- drivers/net/phy/phy.c | 3 --- include/phy.h | 1 - 3 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 1a25775eee6..8992be6e89e 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -693,7 +693,7 @@ static int m88e1680_config(struct phy_device *phydev) return 0; }
-static struct phy_driver M88E1011S_driver = { +U_BOOT_PHY_DRIVER(m88e1011s) = { .name = "Marvell 88E1011S", .uid = 0x1410c60, .mask = 0xffffff0, @@ -703,7 +703,7 @@ static struct phy_driver M88E1011S_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver M88E1111S_driver = { +U_BOOT_PHY_DRIVER(m88e1111s) = { .name = "Marvell 88E1111S", .uid = 0x1410cc0, .mask = 0xffffff0, @@ -713,7 +713,7 @@ static struct phy_driver M88E1111S_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver M88E1118_driver = { +U_BOOT_PHY_DRIVER(m88e1118) = { .name = "Marvell 88E1118", .uid = 0x1410e10, .mask = 0xffffff0, @@ -723,7 +723,7 @@ static struct phy_driver M88E1118_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver M88E1118R_driver = { +U_BOOT_PHY_DRIVER(m88e1118r) = { .name = "Marvell 88E1118R", .uid = 0x1410e40, .mask = 0xffffff0, @@ -733,7 +733,7 @@ static struct phy_driver M88E1118R_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver M88E1121R_driver = { +U_BOOT_PHY_DRIVER(m88e1121r) = { .name = "Marvell 88E1121R", .uid = 0x1410cb0, .mask = 0xffffff0, @@ -743,7 +743,7 @@ static struct phy_driver M88E1121R_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver M88E1145_driver = { +U_BOOT_PHY_DRIVER(m88e1145) = { .name = "Marvell 88E1145", .uid = 0x1410cd0, .mask = 0xffffff0, @@ -753,7 +753,7 @@ static struct phy_driver M88E1145_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver M88E1149S_driver = { +U_BOOT_PHY_DRIVER(m88e1149s) = { .name = "Marvell 88E1149S", .uid = 0x1410ca0, .mask = 0xffffff0, @@ -763,7 +763,7 @@ static struct phy_driver M88E1149S_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver M88E1240_driver = { +U_BOOT_PHY_DRIVER(m88e1240) = { .name = "Marvell 88E1240", .uid = 0x1410e30, .mask = 0xffffff0, @@ -773,7 +773,7 @@ static struct phy_driver M88E1240_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver M88E151x_driver = { +U_BOOT_PHY_DRIVER(m88e151x) = { .name = "Marvell 88E151x", .uid = 0x1410dd0, .mask = 0xffffff0, @@ -785,7 +785,7 @@ static struct phy_driver M88E151x_driver = { .writeext = &m88e1xxx_phy_extwrite, };
-static struct phy_driver M88E1310_driver = { +U_BOOT_PHY_DRIVER(m88e1310) = { .name = "Marvell 88E1310", .uid = 0x01410e90, .mask = 0xffffff0, @@ -795,7 +795,7 @@ static struct phy_driver M88E1310_driver = { .shutdown = &genphy_shutdown, };
-static struct phy_driver M88E1680_driver = { +U_BOOT_PHY_DRIVER(m88e1680) = { .name = "Marvell 88E1680", .uid = 0x1410ed0, .mask = 0xffffff0, @@ -804,20 +804,3 @@ static struct phy_driver M88E1680_driver = { .startup = &genphy_startup, .shutdown = &genphy_shutdown, }; - -int phy_marvell_init(void) -{ - phy_register(&M88E1310_driver); - phy_register(&M88E1149S_driver); - phy_register(&M88E1145_driver); - phy_register(&M88E1121R_driver); - phy_register(&M88E1118_driver); - phy_register(&M88E1118R_driver); - phy_register(&M88E1111S_driver); - phy_register(&M88E1011S_driver); - phy_register(&M88E1240_driver); - phy_register(&M88E151x_driver); - phy_register(&M88E1680_driver); - - return 0; -} diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index e2e31773f6a..efc75808ead 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_PHY_MARVELL - phy_marvell_init(); -#endif #ifdef CONFIG_PHY_MICREL_KSZ8XXX phy_micrel_ksz8xxx_init(); #endif diff --git a/include/phy.h b/include/phy.h index a309056ce77..77e46ebac83 100644 --- a/include/phy.h +++ b/include/phy.h @@ -315,7 +315,6 @@ int gen10g_startup(struct phy_device *phydev); int gen10g_shutdown(struct phy_device *phydev); int gen10g_discover_mmds(struct phy_device *phydev);
-int phy_marvell_init(void); int phy_micrel_ksz8xxx_init(void); int phy_micrel_ksz90x1_init(void); int phy_meson_gxl_init(void);