| Message ID | 20240425-for-2024-07-beagleplay-eth-v1-0-6c985de1c316@kernel.org |
|---|---|
| Headers | show |
| Series | arm: dts: am62-beagleplay: Fix Beagleplay Ethernet | expand |
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 <rogerq@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,
On Fri, May 10, 2024 at 12:55:15PM +0300, Roger Quadros wrote: > 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? Since part 3 was a do not merge I wasn't sure what the end goal of this series was.
On 10/05/2024 16:08, Tom Rini wrote: > On Fri, May 10, 2024 at 12:55:15PM +0300, Roger Quadros wrote: >> 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? > > Since part 3 was a do not merge I wasn't sure what the end goal of this > series was. > Goal was to show what is required to get Ethernet working and DT synced with kernel.org. part 3 can now be merged as the commit is now in linux-next. [1] Maybe it is best if I rebase and send this as v2 and drop the do-not-merge for patch 3? [1] arm64: dts: ti: beagleplay: Fix Ethernet PHY RESET GPIOs commit: 0b1133ee36ecbf3b02f69cc4e8a169f1b6019e40
On Fri, May 10, 2024 at 10:24:41PM +0300, Roger Quadros wrote: > > > On 10/05/2024 16:08, Tom Rini wrote: > > On Fri, May 10, 2024 at 12:55:15PM +0300, Roger Quadros wrote: > >> 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? > > > > Since part 3 was a do not merge I wasn't sure what the end goal of this > > series was. > > > > Goal was to show what is required to get Ethernet working and DT synced with kernel.org. > part 3 can now be merged as the commit is now in linux-next. [1] > > Maybe it is best if I rebase and send this as v2 and drop the do-not-merge for patch 3? > > [1] arm64: dts: ti: beagleplay: Fix Ethernet PHY RESET GPIOs > commit: 0b1133ee36ecbf3b02f69cc4e8a169f1b6019e40 Ah, since it's been merged to -next now, Nishanth, what do you want to do?
On 13:33-20240510, Tom Rini wrote: [...] > > > > [1] arm64: dts: ti: beagleplay: Fix Ethernet PHY RESET GPIOs > > commit: 0b1133ee36ecbf3b02f69cc4e8a169f1b6019e40 > > Ah, since it's been merged to -next now, Nishanth, what do you want to > do? No biggie.. it is on route to kernel master anyways, was planning on OF_UPSTREAM migration for beagle once we settle 6.10-rc1 settles into u-boot.
On Fri, May 10, 2024 at 02:58:37PM -0500, Nishanth Menon wrote: > On 13:33-20240510, Tom Rini wrote: > [...] > > > > > > [1] arm64: dts: ti: beagleplay: Fix Ethernet PHY RESET GPIOs > > > commit: 0b1133ee36ecbf3b02f69cc4e8a169f1b6019e40 > > > > Ah, since it's been merged to -next now, Nishanth, what do you want to > > do? > > No biggie.. it is on route to kernel master anyways, was planning on > OF_UPSTREAM migration for beagle once we settle 6.10-rc1 settles into > u-boot. OK, I'll just grab this iteration.
On Fri, May 10, 2024 at 02:00:56PM -0600, Tom Rini wrote: > On Fri, May 10, 2024 at 02:58:37PM -0500, Nishanth Menon wrote: > > On 13:33-20240510, Tom Rini wrote: > > [...] > > > > > > > > [1] arm64: dts: ti: beagleplay: Fix Ethernet PHY RESET GPIOs > > > > commit: 0b1133ee36ecbf3b02f69cc4e8a169f1b6019e40 > > > > > > Ah, since it's been merged to -next now, Nishanth, what do you want to > > > do? > > > > No biggie.. it is on route to kernel master anyways, was planning on > > OF_UPSTREAM migration for beagle once we settle 6.10-rc1 settles into > > u-boot. > > OK, I'll just grab this iteration. ... needs a rebase anyhow, yes, please do, thanks.
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 Signed-off-by: Roger Quadros <rogerq@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,