[PATCH 2/2] rpi: Copy eth PHY address from fw DT to loaded DT

[Peter Robinson]

On Wed, Aug 10, 2022 at 1:58 PM Antoine Mazeas <antoine at karthanis.net> wrote:
>
> Some Raspberry Pi 400 boards, specifically rev 1.1, have a different address for the ethernet PHY device than what is provided by the kernel DTB. The correct address is provided by the firmware, so we should carry it over into the loaded device tree so that ethernet works on such boards.

Minor nit: this should be properly wrapped.

> Signed-off-by: Antoine Mazeas <antoine at karthanis.net>

Reviewed-by: Peter Robinson <pbrobinson at gmail.com>
Tested-by: Peter Robinson <pbrobinson at gmail.com>

Tested on the RPi400 and a couple of different RPi4s

> ---
>  board/raspberrypi/rpi/rpi.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
> index 28b6f52506..793fd1aa30 100644
> --- a/board/raspberrypi/rpi/rpi.c
> +++ b/board/raspberrypi/rpi/rpi.c
> @@ -548,6 +548,9 @@ void  update_fdt_from_fw(void *fdt, void *fw_fdt)
>
>         /* kernel address randomisation seed as provided by the firmware */
>         copy_property(fdt, fw_fdt, "/chosen", "kaslr-seed");
> +
> +       /* address of the PHY device as provided by the firmware  */
> +       copy_property(fdt, fw_fdt, "ethernet0/mdio at e14/ethernet-phy at 1", "reg");
>  }
>
>  int ft_board_setup(void *blob, struct bd_info *bd)
> --
> 2.37.1
>