Tom,

On 25/04/2024 15:20, Roger Quadros wrote:
> Sync AM62 device tree files with Linux v6.9-rc5 and
> add in the missing bits in -u-boot.dtsi to get CPSW
> Ethernet working.
> 
> The last patch is marked [not-for-merge] as it is not yet
> applied to Linux device tree.
> 
> CI testing
> https://github.com/u-boot/u-boot/pull/527

While the checks have passed, there are some recent conflicts introduced

Conflicting files
arch/arm/dts/k3-am62-phycore-som.dtsi
arch/arm/dts/k3-am625-phyboard-lyra-rdk.dts 

Those files have been removed.

Do you want me to rebase and resend this series?

> 
> Signed-off-by: Roger Quadros <rog...@kernel.org>
> ---
> 
> ---
> Roger Quadros (3):
>       arm: dts: k3-am62*: sync with Linux v6.9-rc5
>       arm: dts: k3-am625-beagleplay: get CPSW Ethernet to work
>       [not-for-merge] arm: dts: k3-am625-beagleplay: Fix Ethernet PHY reset 
> GPIO
> 
>  arch/arm/dts/k3-am62-main.dtsi               | 126 ++++++++++++++---
>  arch/arm/dts/k3-am62-mcu.dtsi                |   4 +-
>  arch/arm/dts/k3-am62-phycore-som.dtsi        |   5 +-
>  arch/arm/dts/k3-am62-thermal.dtsi            |   5 +-
>  arch/arm/dts/k3-am62-wakeup.dtsi             |  38 +++--
>  arch/arm/dts/k3-am62.dtsi                    |   4 +-
>  arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi |  63 +++++++++
>  arch/arm/dts/k3-am625-beagleplay.dts         |  66 ++++-----
>  arch/arm/dts/k3-am625-phyboard-lyra-rdk.dts  | 104 +++++++++++++-
>  arch/arm/dts/k3-am625-sk.dts                 |   4 +-
>  arch/arm/dts/k3-am625.dtsi                   |   4 +-
>  arch/arm/dts/k3-am62a-main.dtsi              | 201 
> +++++++++++++++++++++++++--
>  arch/arm/dts/k3-am62a-mcu.dtsi               |   4 +-
>  arch/arm/dts/k3-am62a-thermal.dtsi           |   5 +-
>  arch/arm/dts/k3-am62a-wakeup.dtsi            |   4 +-
>  arch/arm/dts/k3-am62a.dtsi                   |   4 +-
>  arch/arm/dts/k3-am62a7-sk.dts                | 162 ++++++++++++++++++++-
>  arch/arm/dts/k3-am62a7.dtsi                  |   4 +-
>  arch/arm/dts/k3-am62x-sk-common.dtsi         |  24 +++-
>  19 files changed, 722 insertions(+), 109 deletions(-)
> ---
> base-commit: 38ea74d6d5c05224acdb03f799897c1bdd56f8cc
> change-id: 20240305-for-2024-07-beagleplay-eth-f82a51197937
> 
> Best regards,

-- 
cheers,
-roger

Reply via email to