[PATCH v3 2/3] arm: mvebu: Espressobin: move network setup into a separate function

[Stefan Roese]

On 11/29/23 11:11, Robert Marko wrote:
> Currently, Esspresobin switch is being setup directly in last_stage_init()
> which makes it hard to add support for any other board to be setup.
> 
> So, lets just move the switch setup code to a separate function and call it
> if compatible matches, there should be no functional change.
> 
> Signed-off-by: Robert Marko <robert.marko at sartura.hr>
> Reviewed-by: Stefan Roese <sr at denx.de>

Applied to u-boot-marvell/master

Thanks,
Stefan

> ---
> Changes in v2:
> * Rebase on top of current master and resolve conflicts
> 
>   board/Marvell/mvebu_armada-37xx/board.c | 17 ++++++++++++-----
>   1 file changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/board/Marvell/mvebu_armada-37xx/board.c b/board/Marvell/mvebu_armada-37xx/board.c
> index 1471caa9a6..f532486b70 100644
> --- a/board/Marvell/mvebu_armada-37xx/board.c
> +++ b/board/Marvell/mvebu_armada-37xx/board.c
> @@ -301,14 +301,12 @@ static int mii_multi_chip_mode_write(struct udevice *bus, int dev_smi_addr,
>   	return 0;
>   }
>   
> -/* Bring-up board-specific network stuff */
> -static int last_stage_init(void)
> +static int espressobin_last_stage_init(void)
>   {
>   	struct udevice *bus;
>   	ofnode node;
>   
> -	if (!CONFIG_IS_ENABLED(DM_MDIO) ||
> -	    !of_machine_is_compatible("globalscale,espressobin"))
> +	if (!CONFIG_IS_ENABLED(DM_MDIO))
>   		return 0;
>   
>   	node = ofnode_by_compatible(ofnode_null(), "marvell,orion-mdio");
> @@ -358,8 +356,17 @@ static int last_stage_init(void)
>   
>   	return 0;
>   }
> -EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, last_stage_init);
>   
> +/* Bring-up board-specific network stuff */
> +static int last_stage_init(void)
> +{
> +
> +	if (of_machine_is_compatible("globalscale,espressobin"))
> +		return espressobin_last_stage_init();
> +
> +	return 0;
> +}
> +EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, last_stage_init);
>   #endif
>   
>   #ifdef CONFIG_OF_BOARD_SETUP

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de