[PATCH v2 00/26] sync am65x device tree with Linux v6.7-rc1

[Jan Kiszka]

On 06.01.24 12:57, Jan Kiszka wrote:
> On 29.12.23 18:46, Bryan Brattlof wrote:
>> Hello Again Everyone!
>>
>> This series gets the am65x booting again along with syncing the device
>> tree files with v6.7-rc1 Linux.
>>
>> The bulk of these patches unify the WKUP SPL board file with the arm64
>> files to make future syncs from Linux much easier. In the end the DTBs
>> should look a lot like what the DTBs look like for the am64x which
>> is fairly similar to the am65x.
>>
>> For those interested in what UART boot looks like:
>>    https://paste.sr.ht/~bryanb/7df8a645dc548912cd806abd5ecab967ef3287bc
>>
>> Changes from v1: [0]
>> - fixed multi-line comment format
>> - moved wkup_uart0 and mcu_uart0 U-Boot overrides to the r5 board file
>>   as they are not needed for a53/main domain U-Boot builds
>> - corrected a bad wkup_i2c0_pins_default fixup in PATCH 6/26
>> - spelling fix (s/Libux/Linux/) in commit body for PATCH 6/26
>> - added trailers from Tom
>>
>> Thanks for reviewing and happy holidays
>> ~Bryan
>>
>> [0] https://lore.kernel.org/u-boot/20231221174412.210807-1-bb@ti.com/
>>
>> Bryan Brattlof (26):
>>   configs: am65x_evm_r5: enable driver for fixed regulators
>>   configs: am65x_evm_a53: disable CONSOLE_MUX
>>   arm: dts: k3-am654-r5: Merge board file and U-Boot overlay
>>   arm: dts: k3-am654: pull in dtb update from Linux
>>   arm: dts: k3-am654: copy bootph properties to a53 dts
>>   arm: dts: k3-am654: include a53 board dtb for r5 build
>>   arm: dts: k3-am654: remove duplicate vtt_supply
>>   arm: dts: k3-am654: remove duplicate wkup_uart0
>>   arm: dts: k3-am654: remove duplicate timer
>>   arm: dts: k3-am654: remove duplicate mcu_ringacc
>>   arm: dts: k3-am654: remove duplicate mcu_udmap
>>   arm: dts: k3-am654: add needed regs to udmap nodes
>>   arm: dts: k3-am654: remove duplicate mcu_uart0 node
>>   arm: dts: k3-am654: remove duplicate main_uart0
>>   arm: dts: k3-am654: remove duplicate sdhci0 pinmux node
>>   arm: dts: k3-am654: remove duplicate sdhci1 pinmux node
>>   arm: dts: k3-am654: remove duplicate wkup_i2c0
>>   arm: dts: k3-am654: remove duplicate ospi0 node
>>   arm: dts: k3-am654: remove usb0
>>   arm: dts: k3-am654: remove duplicate mdio
>>   arm: dts: k3-am654: remove duplicate vtt pinmux
>>   arm: dts: k3-am654: remove duplicate root properties
>>   arm: dts: k3-am654: remove un-needed aliases
>>   arm: dts: k3-am654: move dummy_clock to root node
>>   arm: dts: k3-am654: remove duplicate mcu secure proxy node
>>   arm: dts: k3-am654: convert bootph-pre-ram to bootph-all
>>
>>  arch/arm/dts/k3-am65-main.dtsi                | 342 +++++++++++++++---
>>  arch/arm/dts/k3-am65-mcu.dtsi                 | 156 +++++++-
>>  arch/arm/dts/k3-am65-wakeup.dtsi              |  10 +-
>>  arch/arm/dts/k3-am65.dtsi                     |  19 +-
>>  arch/arm/dts/k3-am654-base-board-u-boot.dtsi  | 195 +++++++++-
>>  arch/arm/dts/k3-am654-base-board.dts          | 301 +++++++++------
>>  .../dts/k3-am654-r5-base-board-u-boot.dtsi    | 208 -----------
>>  arch/arm/dts/k3-am654-r5-base-board.dts       | 303 ++++------------
>>  arch/arm/dts/k3-am654.dtsi                    |   7 +
>>  configs/am65x_evm_a53_defconfig               |   1 -
>>  configs/am65x_evm_r5_defconfig                |   2 +
>>  11 files changed, 886 insertions(+), 658 deletions(-)
>>  delete mode 100644 arch/arm/dts/k3-am654-r5-base-board-u-boot.dtsi
>>
>>
>> base-commit: 0a0ceea2269b983e736b80104f03cc800d1a5e2a
> 
> This breaks the IOT2050 boards, probably because it did in incomplete
> sync, changing the core dtsi file without updating all affected boards.
> But also [1] is missing in upstream already and seem to have an impact.
> Bad timing for a sync.
> 
> And the series is not bisectable - already the 3rd patch breaks the build:
> 
> ...
>   DTC     arch/arm/dts/k3-am654-r5-base-board.dtb
> Error: arch/arm/dts/.k3-am654-r5-base-board.dtb.pre.tmp:423.27-28 syntax
> error
> FATAL ERROR: Unable to parse input tree
> 
> Jan
> 
> [1]
> https://lore.kernel.org/lkml/1edbc1b56ed4ff2256d7afb7db3cab4b3a423692.1699087938.git.jan.kiszka@siemens.com/
> 

BTW, folks @TI: You have our devices by now.

Jan

-- 
Siemens AG, Technology
Linux Expert Center