[PATCH 3/4] NSA310S : Use Ethernet PHY name from device tree

[Stefan Roese]

On 01.07.21 06:26, Tony Dinh wrote:
> In DM Ethernet, the old "egiga0" name is no longer valid, so replace it
> with Ethernet PHY name from device tree.
> 
> Signed-off-by: Tony Dinh <mibodhi at gmail.com>
> ---
> 
>   board/zyxel/nsa310s/nsa310s.c | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/board/zyxel/nsa310s/nsa310s.c b/board/zyxel/nsa310s/nsa310s.c
> index cd4a7723b1..29aded1910 100644
> --- a/board/zyxel/nsa310s/nsa310s.c
> +++ b/board/zyxel/nsa310s/nsa310s.c
> @@ -1,5 +1,6 @@
>   // SPDX-License-Identifier: GPL-2.0+
>   /*
> + * Copyright (C) 2021 Tony Dinh <mibodhi at gmail.com>

AFAIU, just changing a few lines, as this patch does, does not justify
to add a copyright notice to this file.

>    * Copyright (C) 2015
>    * Gerald Kerma <dreagle at doukki.net>
>    * Tony Dinh <mibodhi at gmail.com>
> @@ -81,22 +82,18 @@ int board_init(void)
>   	return 0;
>   }
>   
> +#define PHY_ADR	1

You should be able to read this PHY address from the device-tree now.
No need to define this here again.

Thanks,
Stefan

> +
>   #ifdef CONFIG_RESET_PHY_R
>   void reset_phy(void)
>   {
>   	u16 reg;
> -	u16 phyaddr;
> -	char *name = "egiga0";
> +	u16 phyaddr = PHY_ADR;
> +	char *name = "ethernet-controller at 72000";
>   
>   	if (miiphy_set_current_dev(name))
>   		return;
>   
> -	/* read PHY dev address */
> -	if (miiphy_read(name, 0xee, 0xee, (u16 *) &phyaddr)) {
> -		printf("could not read PHY dev address\n");
> -		return;
> -	}
> -
>   	/* set RGMII delay */
>   	miiphy_write(name, phyaddr, MV88E1318_PGADR_REG, MV88E1318_MAC_CTRL_PG);
>   	miiphy_read(name, phyaddr, MV88E1318_MAC_CTRL_REG, &reg);
> @@ -131,5 +128,7 @@ void reset_phy(void)
>   	/* downshift */
>   	miiphy_write(name, phyaddr, 0x10, 0x3860);
>   	miiphy_write(name, phyaddr, 0x0, 0x9140);
> +
> +	printf("MV88E1318 PHY initialized on %s\n", name);
>   }
>   #endif /* CONFIG_RESET_PHY_R */
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
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