On 16:47-20230825, Manorit Chawdhry wrote:
> The following commit syncs the device tree from Linux tag
> v6.5-rc1 to U-boot and fixes the following to be compatible with
> the future syncs -
>
[..]
>
> Signed-off-by: Manorit Chawdhry <m-chawd...@ti.com>
> ---
> arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi | 69 ++---
> arch/arm/dts/k3-am68-sk-base-board.dts | 389
> +++++++++++++++----------
> arch/arm/dts/k3-am68-sk-r5-base-board.dts | 143 ++-------
> arch/arm/dts/k3-am68-sk-som.dtsi | 112 ++-----
These files don't have maintainer entries?
> 4 files changed, 300 insertions(+), 413 deletions(-)
>
> diff --git a/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi
> b/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi
> index 79faa1b5737d..b05a2245b6da 100644
> --- a/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi
> +++ b/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi
> +
[...]
> +&usb0 {
> + dr_mode = "peripheral";
There is a bit of a debate ongoing on this.
https://lore.kernel.org/u-boot/20230706-handle-otg-as-periph-v3-0-27e24fa17...@baylibre.com/
But I don't see why we need to hold off for that resolution.
> bootph-pre-ram;
> };
> diff --git a/arch/arm/dts/k3-am68-sk-r5-base-board.dts
> b/arch/arm/dts/k3-am68-sk-r5-base-board.dts
> index a64baba14986..bb49e866aa2c 100644
> --- a/arch/arm/dts/k3-am68-sk-r5-base-board.dts
> +++ b/arch/arm/dts/k3-am68-sk-r5-base-board.dts
> @@ -1,19 +1,19 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> - * Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/
> + * Copyright (C) 2022-2023 Texas Instruments Incorporated -
> https://www.ti.com/
> */
>
> /dts-v1/;
>
> -#include "k3-am68-sk-som.dtsi"
> +#include "k3-am68-sk-base-board.dts"
> #include "k3-j721s2-ddr-evm-lp4-4266.dtsi"
> #include "k3-j721s2-ddr.dtsi"
> +#include "k3-am68-sk-base-board-u-boot.dtsi"
>
> / {
> chosen {
> - firmware-loader = &fs_loader0;
> stdout-path = &main_uart8;
Does'nt this come from board.dts?
[...]
> &mcu_ringacc {
> @@ -191,4 +85,3 @@
> ti,sci = <&dm_tifs>;
> };
>
There is an extra EoL here.
> -#include "k3-am68-sk-base-board-u-boot.dtsi"
[...]
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5
849D 1736 249D
