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 -
[...]
>
> diff --git a/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
> b/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
> index f940ffee8787..faa01169ebd8 100644
> --- a/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
> +++ b/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
> @@ -1,28 +1,10 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
>
[...]
> -&main_sdhci1 {
> +&usb0 {
> + dr_mode = "peripheral";
There is a bit of a debate going on this one
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-j721s2-r5-common-proc-board.dts
> b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> index c74e8e58ae81..022618b37c74 100644
> --- a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> +++ b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
> @@ -1,20 +1,19 @@
> // SPDX-License-Identifier: GPL-2.0
> /*
> - * Copyright (C) 2021 Texas Instruments Incorporated - https://www.ti.com/
> + * Copyright (C) 2021-2023 Texas Instruments Incorporated -
> https://www.ti.com/
> */
>
> /dts-v1/;
>
> -#include "k3-j721s2-som-p0.dtsi"
> +#include "k3-j721s2-common-proc-board.dts"
> #include "k3-j721s2-ddr-evm-lp4-4266.dtsi"
> #include "k3-j721s2-ddr.dtsi"
> -#include "k3-j721s2-binman.dtsi"
> +#include "k3-j721s2-common-proc-board-u-boot.dtsi"
>
> / {
> chosen {
> - firmware-loader = &fs_loader0;
> stdout-path = &main_uart8;
we don't need this either.
[...]
> - clk_19_2mhz: dummy_clock_19_2mhz {
> - compatible = "fixed-clock";
> - #clock-cells = <0>;
> - clock-frequency = <19200000>;
> +&mcu_timer0 {
> + clock-frequency = <250000000>;
> bootph-pre-ram;
Check your tabs for the clock-frequency and bootph property (you have
one extra tab tab).
> - };
> };
>
[...]
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5
849D 1736 249D
