On Sun, Mar 19, 2023 at 7:05 PM Marek Vasut
<[email protected]> wrote:
>
> The phy_init() is now used only to perform manual relocation of PHY
> driver callbacks. Wrap it in ifdeffery and only call it on systems
> which still require manual relocation, i.e. m68k .
>
> Signed-off-by: Marek Vasut <[email protected]>
> ---
> Cc: "Ariel D'Alessandro" <[email protected]>
> Cc: "Cédric Le Goater" <[email protected]>
> Cc: "Marek Behún" <[email protected]>
> Cc: Alex Nemirovsky <[email protected]>
> Cc: Haolin Li <[email protected]>
> Cc: Heinrich Schuchardt <[email protected]>
> Cc: Joe Hershberger <[email protected]>
> Cc: Joel Stanley <[email protected]>
> Cc: Josua Mayer <[email protected]>
> Cc: Marek Vasut <[email protected]>
> Cc: Michael Trimarchi <[email protected]>
> Cc: Michal Simek <[email protected]>
> Cc: Nate Drude <[email protected]>
> Cc: Neil Armstrong <[email protected]>
> Cc: Radu Pirea <[email protected]>
> Cc: Ramon Fried <[email protected]>
> Cc: Samuel Mendoza-Jonas <[email protected]>
> Cc: Stefan Roese <[email protected]>
> Cc: T Karthik Reddy <[email protected]>
> Cc: Tim Harvey <[email protected]>
> Cc: Vladimir Oltean <[email protected]>
> Cc: [email protected]
> ---
> drivers/net/phy/phy.c | 4 ++--
> net/eth_common.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
> index 61603f28179..9b0e497f223 100644
> --- a/drivers/net/phy/phy.c
> +++ b/drivers/net/phy/phy.c
> @@ -463,9 +463,9 @@ U_BOOT_PHY_DRIVER(genphy) = {
> .shutdown = genphy_shutdown,
> };
>
> +#ifdef CONFIG_NEEDS_MANUAL_RELOC
> int phy_init(void)
> {
> -#ifdef CONFIG_NEEDS_MANUAL_RELOC
> const int ll_n_ents = ll_entry_count(struct phy_driver, phy_driver);
> struct phy_driver *drv, *ll_entry;
>
> @@ -489,10 +489,10 @@ int phy_init(void)
> if (drv->write_mmd)
> drv->write_mmd += gd->reloc_off;
> }
> -#endif
>
> return 0;
> }
> +#endif
>
> int phy_set_supported(struct phy_device *phydev, u32 max_speed)
> {
> diff --git a/net/eth_common.c b/net/eth_common.c
> index 82d527abba6..c94a7ba6ae7 100644
> --- a/net/eth_common.c
> +++ b/net/eth_common.c
> @@ -37,7 +37,7 @@ void eth_common_init(void)
> miiphy_init();
> #endif
>
> -#ifdef CONFIG_PHYLIB
> +#if defined(CONFIG_NEEDS_MANUAL_RELOC) && defined(CONFIG_PHYLIB)
> phy_init();
> #endif
> #endif
> --
> 2.39.2
>
Reviewed-by: Ramon Fried <[email protected]>
