[RFC PATCH 4/4] arm: dts: k3-am62: Bump dtsi from linux v6.5-rc1

[Roger Quadros]

On 13/07/2023 10:20, Nishanth Menon wrote:
> Update the am62 and am625 device-trees from linux v6.3-rc5 This needed the followin
> tweaks to the u-boot specific dtsi as well:
> - Switch tick-timer to the main_timer as it's now defined in the main dtsi
> - Secure proxies are defined in Soc dtsis
> - Drop duplicate nodes - u-boot.dtsi is includes in r5-sk, no need for
>   either the definitions from main.dtsi OR duplication from u-boot.dtsi
> - Add mdio pins to the cpsw3g pinctrl in u-boot dtsi. It moved to a subnode in the
>   linux dtsi that u-boot doesn't use/support
> 
> Cc: Francesco Dolcini <francesco at dolcini.it>
> Cc: Sjoerd Simons <sjoerd at collabora.com>
> Cc: Wadim Egorov <w.egorov at phytec.de>
> Signed-off-by: Nishanth Menon <nm at ti.com>
> ---
> 
> This is a respin of Sjoerd's series.. quiet a bit of sync there. but
> should make it easier to add on newer boards by backporting from
> upstream kernel.
> 
>  arch/arm/dts/k3-am62-main.dtsi       | 389 +++++++++++++++++++++++--
>  arch/arm/dts/k3-am62-mcu.dtsi        |  66 +++++
>  arch/arm/dts/k3-am62-thermal.dtsi    |  33 +++
>  arch/arm/dts/k3-am62-wakeup.dtsi     |  33 ++-
>  arch/arm/dts/k3-am62.dtsi            |  11 +-
>  arch/arm/dts/k3-am625-r5-sk.dts      |  92 +-----
>  arch/arm/dts/k3-am625-sk-u-boot.dtsi |  24 +-
>  arch/arm/dts/k3-am625-sk.dts         | 286 ++-----------------
>  arch/arm/dts/k3-am625.dtsi           |  54 +++-
>  arch/arm/dts/k3-am62x-sk-common.dtsi | 412 +++++++++++++++++++++++++++
>  arch/arm/dts/k3-pinctrl.h            |  53 ++++
>  11 files changed, 1065 insertions(+), 388 deletions(-)
>  create mode 100644 arch/arm/dts/k3-am62-thermal.dtsi
>  create mode 100644 arch/arm/dts/k3-am62x-sk-common.dtsi
>  create mode 100644 arch/arm/dts/k3-pinctrl.h
> 

<snip>

>  
> diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
> index a60c37f1dbf0..76589c7025a0 100644
> --- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi
> +++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi
> @@ -9,7 +9,7 @@
>  / {
>  	chosen {
>  		stdout-path = "serial2:115200n8";
> -		tick-timer = &timer1;
> +		tick-timer = &main_timer0;
>  	};
>  
>  	aliases {
> @@ -21,16 +21,13 @@
>  	};
>  };
>  
> -&cbass_main{
> +&cbass_main {
>  	bootph-pre-ram;
> +};
>  
> -	timer1: timer at 2400000 {
> -		compatible = "ti,omap5430-timer";
> -		reg = <0x00 0x2400000 0x00 0x80>;
> -		ti,timer-alwon;
> -		clock-frequency = <25000000>;
> -		bootph-pre-ram;
> -	};
> +&main_timer0 {
> +	clock-frequency = <25000000>;
> +	bootph-pre-ram;
>  };
>  
>  &dmss {
> @@ -77,10 +74,6 @@
>  	bootph-pre-ram;
>  };
>  
> -&main_uart1 {
> -	bootph-pre-ram;
> -};
> -
>  &cbass_mcu {
>  	bootph-pre-ram;
>  };
> @@ -93,10 +86,6 @@
>  	bootph-pre-ram;
>  };
>  
> -&wkup_uart0 {
> -	bootph-pre-ram;
> -};
> -
>  &sdhci1 {
>  	bootph-pre-ram;
>  };
> @@ -135,6 +124,7 @@
>  	reg-names = "cpsw_nuss", "mac_efuse";

mac_efuse is another odd duck.

The efuse offset needs to be obtained from
"ti,syscon-efuse = <&wkup_conf 0x200>;"
which is already present in am62-main.dtsi

>  	/delete-property/ ranges;

Any idea why we delete ranges?

>  	bootph-pre-ram;
> +	pinctrl-0 = <&main_mdio1_pins_default &main_rgmii1_pins_default>;
>  
>  	cpsw-phy-sel at 04044 {
>  		compatible = "ti,am64-phy-gmii-sel";

This can also go away.
Only bootph-pre-ram required.

-- 
cheers,
-roger