[PATCH v2 7/7] arm: dts: k3-j721e: Sync with v6.5-rc1

[Nishanth Menon]

On 19:44-20230907, Neha Malcom Francis wrote:
> Sync k3-j721e DTS with kernel.org v6.5-rc1.
> 
> Signed-off-by: Neha Malcom Francis <n-francis at ti.com>
> ---
>  .../k3-j721e-common-proc-board-u-boot.dtsi    | 146 +--
>  arch/arm/dts/k3-j721e-common-proc-board.dts   | 483 ++++++---
>  arch/arm/dts/k3-j721e-main.dtsi               | 974 ++++++++++++++++--
>  arch/arm/dts/k3-j721e-mcu-wakeup.dtsi         | 280 ++++-
>  .../arm/dts/k3-j721e-r5-common-proc-board.dts | 302 +-----
>  arch/arm/dts/k3-j721e-r5-sk.dts               | 522 +---------
>  arch/arm/dts/k3-j721e-sk-u-boot.dtsi          | 177 +---
>  arch/arm/dts/k3-j721e-sk.dts                  | 663 +++++++++---
>  arch/arm/dts/k3-j721e-som-p0.dtsi             | 226 ++--
>  arch/arm/dts/k3-j721e-thermal.dtsi            |  75 ++
>  arch/arm/dts/k3-j721e.dtsi                    |  32 +-
>  11 files changed, 2365 insertions(+), 1515 deletions(-)
>  create mode 100644 arch/arm/dts/k3-j721e-thermal.dtsi
> 
> diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> index 540c847eb3..4cca01be61 100644
> --- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> +++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
> @@ -7,15 +7,7 @@
>  #include "k3-j721e-binman.dtsi"
>  
>  / {
> -	chosen {
> -		stdout-path = "serial2:115200n8";
> -		tick-timer = &timer1;
> -	};
> -
>  	aliases {
> -		ethernet0 = &cpsw_port1;
> -		spi0 = &ospi0;
> -		spi1 = &ospi1;
>  		remoteproc0 = &mcu_r5fss0_core0;
>  		remoteproc1 = &mcu_r5fss0_core1;
>  		remoteproc2 = &main_r5fss0_core0;
> @@ -25,61 +17,49 @@
>  		remoteproc6 = &c66_0;
>  		remoteproc7 = &c66_1;
>  		remoteproc8 = &c71_0;
> -		i2c0 = &wkup_i2c0;
> -		i2c1 = &mcu_i2c0;
> -		i2c2 = &mcu_i2c1;
> -		i2c3 = &main_i2c0;
>  	};

As Manorit mentioned, drop the aliases

[...]

> diff --git a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
> index 7bb5ce775c..0452e94b6d 100644
> --- a/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
> +++ b/arch/arm/dts/k3-j721e-r5-common-proc-board.dts
> @@ -12,16 +12,15 @@
>  #include <dt-bindings/phy/phy-cadence.h>

What are you using from phy-cadence.h?

>  

This file has:
* tps659413 -> Should come in from upstream kernel please.
* flash at 0 -> are intentionally changing properties here? if so document
  why - same with ospi nodes (reg)
* hbmc is still retained. Though the node is disabled in u-boot.dtsi

[...]

> diff --git a/arch/arm/dts/k3-j721e-r5-sk.dts b/arch/arm/dts/k3-j721e-r5-sk.dts
> index 1cc64d07f7..f5eb29a861 100644
> --- a/arch/arm/dts/k3-j721e-r5-sk.dts
> +++ b/arch/arm/dts/k3-j721e-r5-sk.dts
> @@ -11,151 +11,13 @@
>  #include "k3-j721e-sk-u-boot.dtsi"
>  
>  / {
> -	model = "Texas Instruments J721E SK R5";
> +	chosen {
> +		tick-timer = &mcu_timer0;
> +	};
>  
we have tps659412 defined here - should have come in from
upstream kernel.org
[...]

>  	flash at 0{
	please fix that space before {
> -		compatible = "jedec,spi-nor";
> -		reg = <0x0>;
> -		spi-tx-bus-width = <8>;
> -		spi-rx-bus-width = <8>;
> -		spi-max-frequency = <25000000>;
> -		cdns,tshsl-ns = <60>;
> -		cdns,tsd2d-ns = <60>;
> -		cdns,tchsh-ns = <60>;
> -		cdns,tslch-ns = <60>;
> -		cdns,read-delay = <4>;
>  		cdns,phy-mode;

Why do we need this anymore?

>  		#address-cells = <1>;
>  		#size-cells = <1>;
>  	};
>  };
[...]

> diff --git a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
> index 205dacff4d..e4bd71913c 100644
> --- a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
> +++ b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi
> @@ -7,14 +7,7 @@
>  #include "k3-j721e-binman.dtsi"

You dont need to include ti-dp83867.h anymore.

>  
>  / {
> -	chosen {
> -		stdout-path = "serial2:115200n8";
> -		tick-timer = &timer1;
> -	};
> -
>  	aliases {
> -		ethernet0 = &cpsw_port1;
> -		spi0 = &ospi0;
>  		remoteproc0 = &mcu_r5fss0_core0;
>  		remoteproc1 = &mcu_r5fss0_core1;
>  		remoteproc2 = &main_r5fss0_core0;
> @@ -24,61 +17,49 @@
>  		remoteproc6 = &c66_0;
>  		remoteproc7 = &c66_1;
>  		remoteproc8 = &c71_0;
> -		i2c0 = &wkup_i2c0;
> -		i2c1 = &mcu_i2c0;
> -		i2c2 = &main_i2c0;
> -		mmc1 = &main_sdhci1;  /* SD Card */

Same comment as before - drop all these aliases.

[...]

> +&mcu_ringacc {
> +	reg =	<0x0 0x2b800000 0x0 0x400000>,
> +		<0x0 0x2b000000 0x0 0x400000>,
> +		<0x0 0x28590000 0x0 0x100>,
> +		<0x0 0x2a500000 0x0 0x40000>,
> +		<0x0 0x28440000 0x0 0x40000>;
> +		reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
> +		bootph-pre-ram;
> +};
>  
> -	chipid at 43000014 {
> +&mcu_udmap {
> +	reg =	<0x0 0x285c0000 0x0 0x100>,
> +		<0x0 0x284c0000 0x0 0x4000>,
> +		<0x0 0x2a800000 0x0 0x40000>,
> +		<0x0 0x284a0000 0x0 0x4000>,
> +		<0x0 0x2aa00000 0x0 0x40000>,
> +		<0x0 0x28400000 0x0 0x2000>;
> +		reg-names = "gcfg", "rchan", "rchanrt", "tchan",
> +			    "tchanrt", "rflow";
>  		bootph-pre-ram;
> -	};
>  };

NOTE: v6.6-rc1 has been tagged yesterday - so it is probably time for us
to sync with that and drop these.

[...]

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D