Skip to contentSkip to conversation

arm: dts: j7200: dtb sync with Linux 6.5-rc1

PATCH In review Reid Tonking 2 participants 5 messages Aug 22, 2023 – Aug 24, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: dts: j7200: dtb sync with Linux 6.5-rc1

Sync j7200 device tree files with Linux 6.5-rc1

- k3-j7200-r5-common-proc-board.dts now inherits from k3-j7200-common-proc-board.dts instead of k3-j7200-som-p0.dtsi. This allows us to trim down the r5 file considerably by using existing properties.

- remove pimux nodes from r5 file

- remove duplicate nodes & node properties from r5/u-boot files

- mcu_timer0 now used instead of timer1

mcu_timer0 device id added to dev-data.c file in order to work

- remove cpsw node

This node is no longer required since the compatible is now fixed

- remove dummy_clock_19_2_mhz

This node wasn't being used anyhere, so it was removed.

- remove dummy_clock_200mhz

main_sdhci0 & main_sdhci1 no longer need dummy clock for eMMC/SD

- fix secure proxy node

mcu_secproxy changed to used secure_prxy_mcu which is already defined in k3-j7200-mcu-wakeup.dtsi

---
based on: 976fb2ffa3 Prepare v2023.10-rc3
boot test: https://gist.github.com/Glockn/1d7a61adac8f3f56c49afffe683704b7

 .../k3-j7200-common-proc-board-u-boot.dtsi    | 109 ++--
 arch/arm/dts/k3-j7200-common-proc-board.dts   | 170 ++++--
 arch/arm/dts/k3-j7200-main.dtsi               | 512 +++++++++++++++++-
 arch/arm/dts/k3-j7200-mcu-wakeup.dtsi         | 265 ++++++++-
 .../arm/dts/k3-j7200-r5-common-proc-board.dts | 289 +---------
 arch/arm/dts/k3-j7200-som-p0.dtsi             | 153 ++++--
 arch/arm/dts/k3-j7200-thermal.dtsi            |  47 ++
 arch/arm/dts/k3-j7200.dtsi                    |  30 +-
 arch/arm/mach-k3/j7200/dev-data.c             |   1 +
 9 files changed, 1134 insertions(+), 442 deletions(-)
 create mode 100644 arch/arm/dts/k3-j7200-thermal.dtsi
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +73 -36
index f25c7136c9..a00e85e366 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/
+ * Copyright (C) 2020-2023 Texas Instruments Incorporated - https://www.ti.com/
  */
 
 #include "k3-j7200-binman.dtsi"
@@ -8,7 +8,7 @@
 / {
 	chosen {
 		stdout-path = "serial2:115200n8";
-		tick-timer = &timer1;
+		tick-timer = &mcu_timer0;
 	};
 
 	aliases {
@@ -28,16 +28,12 @@
 	bootph-pre-ram;
 };
 
-&cbass_mcu_wakeup {
+&main_esm{
 	bootph-pre-ram;
+};
 
-	timer1: timer@40400000 {
-		compatible = "ti,omap5430-timer";
-		reg = <0x0 0x40400000 0x0 0x80>;
-		ti,timer-alwon;
-		clock-frequency = <250000000>;
-		bootph-pre-ram;
-	};
+&cbass_mcu_wakeup {
+	bootph-pre-ram;
 
 	chipid@43000014 {
 		bootph-pre-ram;
@@ -45,8 +41,6 @@
 
 	mcu_navss: bus@28380000 {
 		bootph-pre-ram;
-		#address-cells = <2>;
-		#size-cells = <2>;
 
 		ringacc@2b800000 {
 			reg =	<0x0 0x2b800000 0x0 0x400000>,
@@ -78,10 +72,6 @@
 
 &dmsc {
 	bootph-pre-ram;
-	k3_sysreset: sysreset-controller {
-		compatible = "ti,sci-sysreset";
-		bootph-pre-ram;
-	};
 };
 
 &k3_pds {
@@ -100,6 +90,10 @@
 	bootph-pre-ram;
 };
 
+&wkup_pmx2 {
+	bootph-pre-ram;
+};
+
 &main_pmx0 {
 	bootph-pre-ram;
 };
@@ -108,6 +102,10 @@
 	bootph-pre-ram;
 };
 
+&main_uart2 {
+	bootph-pre-ram;
+};
+
 &mcu_uart0 {
 	bootph-pre-ram;
 };
@@ -122,52 +120,77 @@
 
 &wkup_i2c0 {
 	bootph-pre-ram;
+
+	lp876441: lp876441@4c {
+		bootph-pre-ram;
+
+		regulators: regulators {
+			bootph-pre-ram;
+
+			buck1_reg: buck1 {
+				bootph-pre-ram;
+			};
+		};
+	};
 };
 
 &main_i2c0 {
 	bootph-pre-ram;
+
+	exp1: gpio@20 {
+		bootph-pre-ram;
+	};
+
+	exp2: gpio@22 {
+		bootph-pre-ram;
+	};
 };
 
-&main_i2c0_pins_default {
+&mcu_cpsw {
 	bootph-pre-ram;
 };
 
-&exp2 {
+&mcu_uart0 {
 	bootph-pre-ram;
 };
 
-&mcu_cpsw {
-	reg = <0x0 0x46000000 0x0 0x200000>,
-	      <0x0 0x40f00200 0x0 0x8>;
-	reg-names = "cpsw_nuss", "mac_efuse";
-	/delete-property/ ranges;
-
-	cpsw-phy-sel@40f04040 {
-		compatible = "ti,am654-cpsw-phy-sel";
-		reg= <0x0 0x40f04040 0x0 0x4>;
-		reg-names = "gmii-sel";
-	};
+&wkup_i2c0 {
+	bootph-pre-ram;
 };
 
-&main_usbss0_pins_default {
+&wkup_uart0 {
 	bootph-pre-ram;
 };
 
-&usbss0 {
+&fss {
 	bootph-pre-ram;
-	ti,usb2-only;
 };
 
-&usb0 {
-	dr_mode = "peripheral";
+&main_uart0_pins_default {
 	bootph-pre-ram;
 };
 
-&mcu_fss0_hpb0_pins_default {
+&main_mmc1_pins_default {
 	bootph-pre-ram;
 };
 
-&fss {
+&main_i2c0_pins_default {
+	bootph-pre-ram;
+};
+
+&wkup_i2c0_pins_default {
+	bootph-pre-ram;
+};
+
+&wkup_uart0_pins_default {
+	bootph-pre-ram;
+};
+
+&wkup_gpio_pins_default {
+	bootph-pre-ram;
+};
+
+&wkup_gpio0 {
 	bootph-pre-ram;
 };
 
@@ -183,6 +206,20 @@
 	bootph-pre-ram;
 };
 
+&usbss0 {
+	bootph-pre-ram;
+	ti,usb2-only;
+};
+
+&usb0 {
+	dr_mode = "peripheral";
+	bootph-pre-ram;
+};
+
+&ospi0 {
+	bootph-pre-ram;
+};
+
 &serdes_ln_ctrl {
 	u-boot,mux-autoprobe;
 };
arch/arm/dts/k3-j7200-common-proc-board.dts +111 -59

256 lines not on this page · raw message

arch/arm/dts/k3-j7200-main.dtsi +506 -6

736 lines not on this page · raw message

arch/arm/dts/k3-j7200-mcu-wakeup.dtsi +261 -4

332 lines not on this page · raw message

arch/arm/dts/k3-j7200-r5-common-proc-board.dts +21 -268

345 lines not on this page · raw message

arch/arm/dts/k3-j7200-som-p0.dtsi +103 -50

225 lines not on this page · raw message

arch/arm/dts/k3-j7200-thermal.dtsi new file +47 -0

47 lines not on this page · raw message

arch/arm/dts/k3-j7200.dtsi +11 -19
index b7005b8031..ef73e6d7e8 100644
@@ -7,9 +7,10 @@
 
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/pinctrl/k3.h>
 #include <dt-bindings/soc/ti,sci_pm_domain.h>
 
+#include "k3-pinctrl.h"
+
 / {
 	model = "Texas Instruments K3 J7200 SoC";
 	compatible = "ti,j7200";
@@ -17,21 +18,6 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
-	aliases {
-		serial0 = &wkup_uart0;
-		serial1 = &mcu_uart0;
-		serial2 = &main_uart0;
-		serial3 = &main_uart1;
-		serial4 = &main_uart2;
-		serial5 = &main_uart3;
-		serial6 = &main_uart4;
-		serial7 = &main_uart5;
-		serial8 = &main_uart6;
-		serial9 = &main_uart7;
-		serial10 = &main_uart8;
-		serial11 = &main_uart9;
-	};
-
 	chosen { };
 
 	cpus {
@@ -60,7 +46,7 @@
 			i-cache-sets = <256>;
 			d-cache-size = <0x8000>;
 			d-cache-line-size = <64>;
-			d-cache-sets = <128>;
+			d-cache-sets = <256>;
 			next-level-cache = <&L2_0>;
 		};
 
@@ -74,7 +60,7 @@
 			i-cache-sets = <256>;
 			d-cache-size = <0x8000>;
 			d-cache-line-size = <64>;
-			d-cache-sets = <128>;
+			d-cache-sets = <256>;
 			next-level-cache = <&L2_0>;
 		};
 	};
@@ -82,15 +68,17 @@
 	L2_0: l2-cache0 {
 		compatible = "cache";
 		cache-level = <2>;
+		cache-unified;
 		cache-size = <0x100000>;
 		cache-line-size = <64>;
-		cache-sets = <2048>;
+		cache-sets = <1024>;
 		next-level-cache = <&msmc_l3>;
 	};
 
 	msmc_l3: l3-cache0 {
 		compatible = "cache";
 		cache-level = <3>;
+		cache-unified;
 	};
 
 	firmware {
@@ -124,9 +112,11 @@
 		#size-cells = <2>;
 		ranges = <0x00 0x00100000 0x00 0x00100000 0x00 0x00020000>, /* ctrl mmr */
 			 <0x00 0x00600000 0x00 0x00600000 0x00 0x00031100>, /* GPIO */
+			 <0x00 0x00700000 0x00 0x00700000 0x00 0x00001000>, /* ESM */
 			 <0x00 0x00a40000 0x00 0x00a40000 0x00 0x00000800>, /* timesync router */
 			 <0x00 0x01000000 0x00 0x01000000 0x00 0x0d000000>, /* Most peripherals */
 			 <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>, /* MAIN NAVSS */
+			 <0x00 0x6f000000 0x00 0x6f000000 0x00 0x00310000>, /* A72 PERIPHBASE */
 			 <0x00 0x70000000 0x00 0x70000000 0x00 0x00800000>, /* MSMC RAM */
 			 <0x00 0x18000000 0x00 0x18000000 0x00 0x08000000>, /* PCIe1 DAT0 */
 			 <0x41 0x00000000 0x41 0x00000000 0x01 0x00000000>, /* PCIe1 DAT1 */
@@ -165,6 +155,8 @@
 				 <0x07 0x00000000 0x07 0x00000000 0x01 0x00000000>; /* FSS OSPI1 data region 3 */
 		};
 	};
+
+	#include "k3-j7200-thermal.dtsi"
 };
 
 /* Now include the peripherals for each bus segments */
arch/arm/mach-k3/j7200/dev-data.c +1 -0
index 4ddc34210e..8ce6796fd0 100644
@@ -46,6 +46,7 @@ static struct ti_lpsc soc_lpsc_list[] = {
 
 static struct ti_dev soc_dev_list[] = {
 	PSC_DEV(30, &soc_lpsc_list[0]),
+	PSC_DEV(35, &soc_lpsc_list[0]),
 	PSC_DEV(61, &soc_lpsc_list[1]),
 	PSC_DEV(90, &soc_lpsc_list[2]),
 	PSC_DEV(8, &soc_lpsc_list[3]),
Signature · 1 line
2.34.1
author
#1 lore raw

On 13:57-20230822, Reid Tonking wrote:

[...]

Quoted 27 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -14
index e62f9218e8..bd4be7215f 100644
@@ -41,44 +31,34 @@
 		ti,sci-host-id = <10>;
 		bootph-pre-ram;
 	};
-
-	clk_200mhz: dummy_clock_200mhz {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <200000000>;
-		bootph-pre-ram;
-	};
-
-	clk_19_2mhz: dummy_clock_19_2mhz {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <19200000>;
-		bootph-pre-ram;
-	};
 };
 
 &memorycontroller {
 	power-domains = <&k3_pds 8 TI_SCI_PD_SHARED>,
 			<&k3_pds 90 TI_SCI_PD_SHARED>;

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 48

Quoted 10 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +8 -0
 	clocks = <&k3_clks 8 5>, <&k3_clks 30 9>;
+	bootph-pre-ram;
+};
+
+&mcu_timer0 {
+	/delete-property/ power-domains;
+	ti,timer-alwon;
+	clock-frequency = <25000000>;
+	bootph-pre-ram;
 };

This needs to be..
$mcu_timer0 {
clock-frequency = <25000000>;
bootph-pre-ram;
};

This fix was accidently left out of the commit, so it'll be changed for v2. The change to dev-data.c allows this.

-Reid

#2 lore raw
In reply to Reid Tonking
Quoted 1 line · Reid Tonking

Sync j7200 device tree files with Linux 6.5-rc1

I understand this is a major step forward, but a still:

There is more work to do:
a) split the dev-data.c fixup as the first patch
b) See comments in https://lore.kernel.org/u-boot/20230816114445.c4c7rgdp5arhmiaq@polyester/

[...]

Quoted 13 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +1 -1
index f25c7136c9..a00e85e366 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/
+ * Copyright (C) 2020-2023 Texas Instruments Incorporated - https://www.ti.com/
  */
 
 #include "k3-j7200-binman.dtsi"

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 10

Quoted 3 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +0 -0
@@ -8,7 +8,7 @@
 / {
 	chosen {
 		stdout-path = "serial2:115200n8";

Drop this

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 14

Quoted 5 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +1 -1
-		tick-timer = &timer1;
+		tick-timer = &mcu_timer0;
 	};
 
 	aliases {

You dont need the aliases - these come in from board.dts

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 31

Quoted 6 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +1 -1
@@ -28,16 +28,12 @@
 	bootph-pre-ram;
 };
 
-&cbass_mcu_wakeup {
+&main_esm{

space before the {

Quoted 5 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +1 -2
 	bootph-pre-ram;
+};
 
-	timer1: timer@40400000 {
-		compatible = "ti,omap5430-timer";

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 39

Quoted 10 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +2 -5
-		reg = <0x0 0x40400000 0x0 0x80>;
-		ti,timer-alwon;
-		clock-frequency = <250000000>;
-		bootph-pre-ram;
-	};
+&cbass_mcu_wakeup {
+	bootph-pre-ram;
 
 	chipid@43000014 {
 		bootph-pre-ram;

};
End it here.

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 42

Quoted 3 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +0 -0
@@ -45,8 +41,6 @@
 
 	mcu_navss: bus@28380000 {

Dont duplicate the entire node.

&mcu_navss {
	bootph-pre-ram;
};
&mcu_ringacc {
	bootph-pre-ram;
};

NOTE: you only need to override reg-names and reg in R5.dtsi not u-boot.dtsi.

&mcu_udmap {
	bootph-pre-ram;
};

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 46

Quoted 6 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +0 -2
 		bootph-pre-ram;
-		#address-cells = <2>;
-		#size-cells = <2>;
 
 		ringacc@2b800000 {
 			reg =	<0x0 0x2b800000 0x0 0x400000>,

And clean this up.

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 124

Quoted 5 lines

&wkup_i2c0 {

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +2 -0
 	bootph-pre-ram;
+
+	lp876441: lp876441@4c {

NAK. Why is this new stuff coming in -> should'nt be here.

Quoted 6 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +6 -0
+		bootph-pre-ram;
+
+		regulators: regulators {
+			bootph-pre-ram;
+
+			buck1_reg: buck1 {

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 140

Quoted 10 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +6 -0
+				bootph-pre-ram;
+			};
+		};
+	};
 };
 
 &main_i2c0 {
 	bootph-pre-ram;
+
+	exp1: gpio@20 {

Again - just do it using the reference

&exp1 {
	bootph-pre-ram;
};

And this pattern repeats itself..

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 144

Quoted 4 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +4 -0
+		bootph-pre-ram;
+	};
+
+	exp2: gpio@22 {

This as well.

hbmc -> arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi: flash@0,0 weird that does'nt throw a dtbs_check warning

WARNING: u-boot,mux-autoprobe -> this is'nt supported.

Also &main_r5fss0 -> ti,cluster-mode=<0> -> Drop that.

There is a bit debate about dr_mode = "peripheral";
https://lore.kernel.org/u-boot/[email protected]/#r

Depending on where it ends up...

[...]

Quoted 4 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -0
index e62f9218e8..bd4be7215f 100644

[...]

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 47

Quoted 5 lines

+&mcu_timer0 {

arch/arm/dts/k3-j7200-r5-common-proc-board.dts +4 -0
+	/delete-property/ power-domains;
+	ti,timer-alwon;
+	clock-frequency = <25000000>;
+	bootph-pre-ram;

you already caught this - just pre-ram and clock-frequency.

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 51

Quoted 5 lines

};

&cbass_mcu_wakeup {

arch/arm/dts/k3-j7200-r5-common-proc-board.dts +1 -1
-	mcu_secproxy: secproxy@2a380000 {
+	secure_proxy_mcu: mailbox@2a480000 {

Move this out.

Quoted 11 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +1 -6
 		bootph-pre-ram;
-		compatible = "ti,am654-secure-proxy";
-		reg = <0x0 0x2a380000 0x0 0x80000>,
-		      <0x0 0x2a400000 0x0 0x80000>,
-		      <0x0 0x2a480000 0x0 0x80000>;
-		reg-names = "rt", "scfg", "target_data";
-		#mbox-cells = <1>;
+		status = "okay";
 	};
 
 	sysctrler: sysctrler {

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 64

Quoted 10 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +3 -2
-		bootph-pre-ram;
 		compatible = "ti,am654-system-controller";
-		mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>;
+		mboxes= <&secure_proxy_mcu 4>,
+			<&secure_proxy_mcu 5>;
 		mbox-names = "tx", "rx";
+		bootph-pre-ram;
 	};
 
 	dm_tifs: dm-tifs {

Move this to root similar to am625. it is more or less a hanky stuff we do with this.

Quoted 163 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +4 -146
@@ -86,250 +66,23 @@
 		ti,host-id = <3>;
 		ti,secure-host;
 		mbox-names = "rx", "tx";
-		mboxes= <&mcu_secproxy 21>,
-			<&mcu_secproxy 23>;
+		mboxes= <&secure_proxy_mcu 21>,
+			<&secure_proxy_mcu 23>;
 		bootph-pre-ram;
 	};
-
-	wkup_vtm0: vtm@42040000 {
-		compatible = "ti,am654-vtm", "ti,j721e-avs";
-		reg = <0x0 0x42040000 0x0 0x330>;
-		power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>;
-		#thermal-sensor-cells = <1>;
-	};
 };
 
 &dmsc {
-	mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;
+	mboxes= <&secure_proxy_mcu 8>,
+		<&secure_proxy_mcu 6>, <&secure_proxy_mcu 5>;
 	mbox-names = "tx", "rx", "notify";
 	ti,host-id = <4>;
 	ti,secure-host;
-};
-
-&wkup_pmx0 {
-	bootph-pre-ram;
-	wkup_uart0_pins_default: wkup_uart0_pins_default {
-		bootph-pre-ram;
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0xb0, PIN_INPUT, 0) /* (B14) WKUP_UART0_RXD */
-			J721E_WKUP_IOPAD(0xb4, PIN_OUTPUT, 0) /* (A14) WKUP_UART0_TXD */
-		>;
-	};
-
-	mcu_uart0_pins_default: mcu_uart0_pins_default {
-		bootph-pre-ram;
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0xf4, PIN_INPUT, 0) /* (D20) WKUP_GPIO0_13.MCU_UART0_RXD */
-			J721E_WKUP_IOPAD(0xf0, PIN_OUTPUT, 0) /* (D19) WKUP_GPIO0_12.MCU_UART0_TXD */
-			J721E_WKUP_IOPAD(0xf8, PIN_INPUT, 0) /* (E20) WKUP_GPIO0_14.MCU_UART0_CTSn */
-			J721E_WKUP_IOPAD(0xfc, PIN_OUTPUT, 0) /* (E21) WKUP_GPIO0_15.MCU_UART0_RTSn */
-		>;
-	};
-
-	wkup_i2c0_pins_default: wkup-i2c0-pins-default {
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0x100, PIN_INPUT_PULLUP, 0) /* (F20) WKUP_I2C0_SCL */
-			J721E_WKUP_IOPAD(0x104, PIN_INPUT_PULLUP, 0) /* (H21) WKUP_I2C0_SDA */
-		>;
-	};
-
-	mcu_fss0_hpb0_pins_default: mcu-fss0-hpb0-pins-default {
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0x0, PIN_OUTPUT, 1) /* (E20) MCU_OSPI0_CLK.MCU_HYPERBUS0_CK */
-			J721E_WKUP_IOPAD(0x4, PIN_OUTPUT, 1) /* (C21) MCU_OSPI0_LBCLKO.MCU_HYPERBUS0_CKn */
-			J721E_WKUP_IOPAD(0x2c, PIN_OUTPUT, 1) /* (F19) MCU_OSPI0_CSn0.MCU_HYPERBUS0_CSn0 */
-			J721E_WKUP_IOPAD(0x54, PIN_OUTPUT, 3) /* (E22) MCU_OSPI1_CSn1.MCU_HYPERBUS0_CSn1 */
-			J721E_WKUP_IOPAD(0x30, PIN_OUTPUT, 1) /* (E19) MCU_OSPI0_CSn1.MCU_HYPERBUS0_RESETn */
-			J721E_WKUP_IOPAD(0x8, PIN_INPUT, 1) /* (D21) MCU_OSPI0_DQS.MCU_HYPERBUS0_RWDS */
-			J721E_WKUP_IOPAD(0xc, PIN_INPUT, 1) /* (D20) MCU_OSPI0_D0.MCU_HYPERBUS0_DQ0 */
-			J721E_WKUP_IOPAD(0x10, PIN_INPUT, 1) /* (G19) MCU_OSPI0_D1.MCU_HYPERBUS0_DQ1 */
-			J721E_WKUP_IOPAD(0x14, PIN_INPUT, 1) /* (G20) MCU_OSPI0_D2.MCU_HYPERBUS0_DQ2 */
-			J721E_WKUP_IOPAD(0x18, PIN_INPUT, 1) /* (F20) MCU_OSPI0_D3.MCU_HYPERBUS0_DQ3 */
-			J721E_WKUP_IOPAD(0x1c, PIN_INPUT, 1) /* (F21) MCU_OSPI0_D4.MCU_HYPERBUS0_DQ4 */
-			J721E_WKUP_IOPAD(0x20, PIN_INPUT, 1) /* (E21) MCU_OSPI0_D5.MCU_HYPERBUS0_DQ5 */
-			J721E_WKUP_IOPAD(0x24, PIN_INPUT, 1) /* (B22) MCU_OSPI0_D6.MCU_HYPERBUS0_DQ6 */
-			J721E_WKUP_IOPAD(0x28, PIN_INPUT, 1) /* (G21) MCU_OSPI0_D7.MCU_HYPERBUS0_DQ7 */
-		>;
-	};
-
-	wkup_gpio_pins_default: wkup-gpio-pins-default {
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0xd8, PIN_INPUT, 7) /* (C14) WKUP_GPIO0_6 */
-		>;
-	};
-};
-
-&main_pmx0 {
-	bootph-pre-ram;
-
-	main_uart0_pins_default: main_uart0_pins_default {
-		bootph-pre-ram;
-		pinctrl-single,pins = <
-			J721E_IOPAD(0xb0, PIN_INPUT, 0) /* (T16) UART0_RXD */
-			J721E_IOPAD(0xb4, PIN_OUTPUT, 0) /* (T17) UART0_TXD */
-			J721E_IOPAD(0xc0, PIN_INPUT, 2) /* (W3) SPI0_CS0.UART0_CTSn */
-			J721E_IOPAD(0xc4, PIN_OUTPUT, 2) /* (U5) SPI0_CS1.UART0_RTSn */
-		>;
-	};
-
-	main_i2c0_pins_default: main-i2c0-pins-default {
-		bootph-pre-ram;
-		pinctrl-single,pins = <
-			J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */
-			J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */
-		>;
-	};
-
-	main_mmc1_pins_default: main_mmc1_pins_default {
-		pinctrl-single,pins = <
-			J721E_IOPAD(0x104, PIN_INPUT, 0) /* (M20) MMC1_CMD */
-			J721E_IOPAD(0x100, PIN_INPUT, 0) /* (P21) MMC1_CLK */
-			J721E_IOPAD(0xfc, PIN_INPUT, 0) /* (P25) MMC1_CLKLB */
-			J721E_IOPAD(0xf8, PIN_INPUT, 0) /* (M19) MMC1_DAT0 */
-			J721E_IOPAD(0xf4, PIN_INPUT, 0) /* (N21) MMC1_DAT1 */
-			J721E_IOPAD(0xf0, PIN_INPUT, 0) /* (N20) MMC1_DAT2 */
-			J721E_IOPAD(0xec, PIN_INPUT, 0) /* (N19) MMC1_DAT3 */
-			J721E_IOPAD(0xe4, PIN_INPUT, 8) /* (V1) TIMER_IO0.MMC1_SDCD */
-		>;
-	};
-
-	main_usbss0_pins_default: main_usbss0_pins_default {
-		pinctrl-single,pins = <
-			J721E_IOPAD(0x120, PIN_OUTPUT, 0) /* (T4) USB0_DRVVBUS */
-		>;
-	};
-};
-
-&wkup_uart0 {
 	bootph-pre-ram;
-	pinctrl-names = "default";
-	pinctrl-0 = <&wkup_uart0_pins_default>;
-	status = "okay";
-};
-
-&mcu_uart0 {
-	/delete-property/ power-domains;
-	/delete-property/ clocks;
-	/delete-property/ clock-names;
-	pinctrl-names = "default";
-	pinctrl-0 = <&mcu_uart0_pins_default>;
-	status = "okay";
-	clock-frequency = <96000000>;
-};
-
-&main_uart0 {
-	status = "okay";
-	power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&main_uart0_pins_default>;
-	status = "okay";
-};
-
-&main_sdhci0 {
-	/delete-property/ power-domains;
-	/delete-property/ assigned-clocks;
-	/delete-property/ assigned-clock-parents;
-	pinctrl-0 = <&main_mmc1_pins_default>;
-	pinctrl-names = "default";
-	clock-names = "clk_xin";
-	clocks = <&clk_200mhz>;
-	ti,driver-strength-ohm = <50>;
-	non-removable;
-	bus-width = <8>;
-};
-
-&main_sdhci1 {
-	/delete-property/ power-domains;
-	/delete-property/ assigned-clocks;

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 253

Quoted 10 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -10
-	/delete-property/ assigned-clock-parents;
-	clock-names = "clk_xin";
-	clocks = <&clk_200mhz>;
-	ti,driver-strength-ohm = <50>;
-};
-
-&wkup_i2c0 {
-	bootph-pre-ram;
-	lp876441: lp876441@4c {
-		compatible = "ti,lp876441";

There is no such driver in linux kernel compatible space. might need a ticket to implement the driver.

Quoted 14 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -14
-		reg = <0x4c>;
-		bootph-pre-ram;
-		pinctrl-names = "default";
-		pinctrl-0 = <&wkup_i2c0_pins_default>;
-		clock-frequency = <400000>;
-
-		regulators: regulators {
-			bootph-pre-ram;
-			buck1_reg: buck1 {
-				/*VDD_CPU_AVS_REG*/
-				regulator-name = "buck1";
-				regulator-min-microvolt = <800000>;
-				regulator-max-microvolt = <1250000>;
-				regulator-always-on;

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 85

Quoted 10 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +1 -6
-				regulator-boot-on;
-				bootph-pre-ram;
-			};
-		};
-	};
-
 };
 
 &wkup_vtm0 {
+	compatible = "ti,am654-vtm", "ti,j721e-avs";

&wkup_vtm0 -> there is already stuff coming in from kernel. why do we need to define our own compatible "ti,am654-vtm", "ti,j721e-avs"? there is already compatible = "ti,j7200-vtm"; if we need to fix the driver as part of the series, please do as a path in the series.

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 86

Quoted 1 line
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -0
 	vdd-supply-2 = <&buck1_reg>;

Should have been handled in kernel please. Please file an internal tracking ticket for this to be handled.

Quoted 48 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -46
 	bootph-pre-ram;
 };
-
-&main_i2c0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&main_i2c0_pins_default>;
-	clock-frequency = <400000>;
-
-	exp1: gpio@20 {
-		compatible = "ti,tca6416";
-		reg = <0x20>;
-		gpio-controller;
-		#gpio-cells = <2>;
-	};
-
-	exp2: gpio@22 {
-		compatible = "ti,tca6424";
-		reg = <0x22>;
-		gpio-controller;
-		#gpio-cells = <2>;
-	};
-};
-
-&usbss0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&main_usbss0_pins_default>;
-	ti,vbus-divider;
-	ti,usb2-only;
-};
-
-&usb0 {
-	dr_mode = "otg";
-	maximum-speed = "high-speed";
-};
-
-&hbmc {
-	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&mcu_fss0_hpb0_pins_default>;
-	reg = <0x0 0x47040000 0x0 0x100>,
-	      <0x0 0x50000000 0x0 0x8000000>;
-	ranges = <0x0 0x0 0x0 0x50000000 0x4000000>, /* 64MB Flash on CS0 */
-		 <0x1 0x0 0x0 0x54000000 0x800000>; /* 8MB flash on CS1 */
-
-	flash@0,0 {
-		compatible = "cypress,hyperflash", "cfi-flash";
-		reg = <0x0 0x0 0x4000000>;
-	};

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 335

Quoted 10 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -10
-};
-
-&mcu_ringacc {
-	ti,sci = <&dm_tifs>;
-};
-
-&mcu_udmap {
-	ti,sci = <&dm_tifs>;
-};
-#include "k3-j7200-common-proc-board-u-boot.dtsi"

https://gist.github.com/nmenon/662262b0256eab004485035a02ede963
is probably the set of changes I commented about above.

arch/arm/mach-k3/j7200/dev-data.c

Quoted 1 line
arch/arm/mach-k3/j7200/dev-data.c +0 -0

Split this out as a separate patch.

Quoted 14 lines

index 4ddc34210e..8ce6796fd0 100644

arch/arm/mach-k3/j7200/dev-data.c +1 -0
@@ -46,6 +46,7 @@ static struct ti_lpsc soc_lpsc_list[] = {
 
 static struct ti_dev soc_dev_list[] = {
 	PSC_DEV(30, &soc_lpsc_list[0]),
+	PSC_DEV(35, &soc_lpsc_list[0]),
 	PSC_DEV(61, &soc_lpsc_list[1]),
 	PSC_DEV(90, &soc_lpsc_list[2]),
 	PSC_DEV(8, &soc_lpsc_list[3]),
Signature · 1 line
2.34.1
Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
author
#3 lore raw
Quoted 60 lines · Nishanth Menon
Quoted 1 line · Reid Tonking

Sync j7200 device tree files with Linux 6.5-rc1

I understand this is a major step forward, but a still:

There is more work to do:
a) split the dev-data.c fixup as the first patch
b) See comments in https://lore.kernel.org/u-boot/20230816114445.c4c7rgdp5arhmiaq@polyester/

[...]

Quoted 13 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +1 -1
index f25c7136c9..a00e85e366 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/
+ * Copyright (C) 2020-2023 Texas Instruments Incorporated - https://www.ti.com/
  */
 
 #include "k3-j7200-binman.dtsi"

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 10

Quoted 3 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +0 -0
@@ -8,7 +8,7 @@
 / {
 	chosen {
 		stdout-path = "serial2:115200n8";

Drop this

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 14

Quoted 5 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +1 -1
-		tick-timer = &timer1;
+		tick-timer = &mcu_timer0;
 	};
 
 	aliases {

You dont need the aliases - these come in from board.dts

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 31

Quoted 6 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +1 -1
@@ -28,16 +28,12 @@
 	bootph-pre-ram;
 };
 
-&cbass_mcu_wakeup {
+&main_esm{

space before the {

Quoted 13 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +3 -7
 	bootph-pre-ram;
+};
 
-	timer1: timer@40400000 {
-		compatible = "ti,omap5430-timer";
-		reg = <0x0 0x40400000 0x0 0x80>;
-		ti,timer-alwon;
-		clock-frequency = <250000000>;
-		bootph-pre-ram;
-	};
+&cbass_mcu_wakeup {
+	bootph-pre-ram;
 
Quoted 6 lines

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 39

Quoted 2 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +0 -0
 	chipid@43000014 {
 		bootph-pre-ram;

};
End it here.

all the above, done

Quoted 9 lines

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 42

Quoted 3 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +0 -0
@@ -45,8 +41,6 @@
 
 	mcu_navss: bus@28380000 {

Dont duplicate the entire node.

&mcu_navss {
	bootph-pre-ram;
};
Quoted 8 lines
&mcu_ringacc {
	bootph-pre-ram;
};

NOTE: you only need to override reg-names and reg in R5.dtsi not u-boot.dtsi.

&mcu_udmap {
	bootph-pre-ram;
};

I saw you mentioned at [0] that mcu_ringacc (and I assume mcu_udmap) need to be retained for now. If moved to r5.dts, something breaks, as dhcp fails then [1]. Should the full nodes remain for now until 6.6-rc1 sync? I'll still take them outside of mcu_navss.

[0] https://lore.kernel.org/all/20230816114445.c4c7rgdp5arhmiaq@polyester/
[1] https://gist.github.com/Glockn/f0cf1ae8f8fd92e70f4e798c6221e81a

Quoted 8 lines

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 46

Quoted 6 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +0 -2
 		bootph-pre-ram;
-		#address-cells = <2>;
-		#size-cells = <2>;
 
 		ringacc@2b800000 {
 			reg =	<0x0 0x2b800000 0x0 0x400000>,

And clean this up.

Quoted 1 line
Quoted 7 lines

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 124

Quoted 4 lines

&wkup_i2c0 {

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +2 -0
 	bootph-pre-ram;
+
+	lp876441: lp876441@4c {

NAK. Why is this new stuff coming in -> should'nt be here.

This was left because &wkup_vtm0 uses &buck1_reg below which isn't apart of the kernel dt files.

Quoted 22 lines
Quoted 6 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +6 -0
+		bootph-pre-ram;
+
+		regulators: regulators {
+			bootph-pre-ram;
+
+			buck1_reg: buck1 {

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 140

Quoted 10 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +6 -0
+				bootph-pre-ram;
+			};
+		};
+	};
 };
 
 &main_i2c0 {
 	bootph-pre-ram;
+
+	exp1: gpio@20 {

Again - just do it using the reference

&exp1 {
	bootph-pre-ram;
};
Quoted 9 lines

And this pattern repeats itself..

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 144

Quoted 4 lines
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +4 -0
+		bootph-pre-ram;
+	};
+
+	exp2: gpio@22 {

This as well.

will do

Quoted 6 lines

hbmc -> arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi: flash@0,0 weird that does'nt throw a dtbs_check warning

WARNING: u-boot,mux-autoprobe -> this is'nt supported.

change these to bootph-pre-ram?

Quoted 7 lines

Also &main_r5fss0 -> ti,cluster-mode=<0> -> Drop that.

There is a bit debate about dr_mode = "peripheral";
https://lore.kernel.org/u-boot/[email protected]/#r

Depending on where it ends up...

I'll keep an eye on this

Quoted 17 lines

[...]

Quoted 4 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -0
index e62f9218e8..bd4be7215f 100644

[...]

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 47

Quoted 5 lines

+&mcu_timer0 {

arch/arm/dts/k3-j7200-r5-common-proc-board.dts +4 -0
+	/delete-property/ power-domains;
+	ti,timer-alwon;
+	clock-frequency = <25000000>;
+	bootph-pre-ram;

you already caught this - just pre-ram and clock-frequency.

Quoted 8 lines

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 51

Quoted 5 lines

};

&cbass_mcu_wakeup {

arch/arm/dts/k3-j7200-r5-common-proc-board.dts +1 -1
-	mcu_secproxy: secproxy@2a380000 {
+	secure_proxy_mcu: mailbox@2a480000 {

Move this out.

done

Quoted 20 lines
Quoted 20 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +4 -8
 		bootph-pre-ram;
-		compatible = "ti,am654-secure-proxy";
-		reg = <0x0 0x2a380000 0x0 0x80000>,
-		      <0x0 0x2a400000 0x0 0x80000>,
-		      <0x0 0x2a480000 0x0 0x80000>;
-		reg-names = "rt", "scfg", "target_data";
-		#mbox-cells = <1>;
+		status = "okay";
 	};
 
 	sysctrler: sysctrler {
-		bootph-pre-ram;
 		compatible = "ti,am654-system-controller";
-		mboxes= <&mcu_secproxy 4>, <&mcu_secproxy 5>;
+		mboxes= <&secure_proxy_mcu 4>,
+			<&secure_proxy_mcu 5>;
 		mbox-names = "tx", "rx";
+		bootph-pre-ram;
 	};
Quoted 4 lines
Quoted 1 line

dm_tifs: dm-tifs {

Move this to root similar to am625. it is more or less a hanky stuff we do with this.

done

Quoted 168 lines
Quoted 168 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +4 -151
@@ -86,250 +66,23 @@
 		ti,host-id = <3>;
 		ti,secure-host;
 		mbox-names = "rx", "tx";
-		mboxes= <&mcu_secproxy 21>,
-			<&mcu_secproxy 23>;
+		mboxes= <&secure_proxy_mcu 21>,
+			<&secure_proxy_mcu 23>;
 		bootph-pre-ram;
 	};
-
-	wkup_vtm0: vtm@42040000 {
-		compatible = "ti,am654-vtm", "ti,j721e-avs";
-		reg = <0x0 0x42040000 0x0 0x330>;
-		power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>;
-		#thermal-sensor-cells = <1>;
-	};
 };
 
 &dmsc {
-	mboxes= <&mcu_secproxy 8>, <&mcu_secproxy 6>, <&mcu_secproxy 5>;
+	mboxes= <&secure_proxy_mcu 8>,
+		<&secure_proxy_mcu 6>, <&secure_proxy_mcu 5>;
 	mbox-names = "tx", "rx", "notify";
 	ti,host-id = <4>;
 	ti,secure-host;
-};
-
-&wkup_pmx0 {
-	bootph-pre-ram;
-	wkup_uart0_pins_default: wkup_uart0_pins_default {
-		bootph-pre-ram;
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0xb0, PIN_INPUT, 0) /* (B14) WKUP_UART0_RXD */
-			J721E_WKUP_IOPAD(0xb4, PIN_OUTPUT, 0) /* (A14) WKUP_UART0_TXD */
-		>;
-	};
-
-	mcu_uart0_pins_default: mcu_uart0_pins_default {
-		bootph-pre-ram;
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0xf4, PIN_INPUT, 0) /* (D20) WKUP_GPIO0_13.MCU_UART0_RXD */
-			J721E_WKUP_IOPAD(0xf0, PIN_OUTPUT, 0) /* (D19) WKUP_GPIO0_12.MCU_UART0_TXD */
-			J721E_WKUP_IOPAD(0xf8, PIN_INPUT, 0) /* (E20) WKUP_GPIO0_14.MCU_UART0_CTSn */
-			J721E_WKUP_IOPAD(0xfc, PIN_OUTPUT, 0) /* (E21) WKUP_GPIO0_15.MCU_UART0_RTSn */
-		>;
-	};
-
-	wkup_i2c0_pins_default: wkup-i2c0-pins-default {
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0x100, PIN_INPUT_PULLUP, 0) /* (F20) WKUP_I2C0_SCL */
-			J721E_WKUP_IOPAD(0x104, PIN_INPUT_PULLUP, 0) /* (H21) WKUP_I2C0_SDA */
-		>;
-	};
-
-	mcu_fss0_hpb0_pins_default: mcu-fss0-hpb0-pins-default {
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0x0, PIN_OUTPUT, 1) /* (E20) MCU_OSPI0_CLK.MCU_HYPERBUS0_CK */
-			J721E_WKUP_IOPAD(0x4, PIN_OUTPUT, 1) /* (C21) MCU_OSPI0_LBCLKO.MCU_HYPERBUS0_CKn */
-			J721E_WKUP_IOPAD(0x2c, PIN_OUTPUT, 1) /* (F19) MCU_OSPI0_CSn0.MCU_HYPERBUS0_CSn0 */
-			J721E_WKUP_IOPAD(0x54, PIN_OUTPUT, 3) /* (E22) MCU_OSPI1_CSn1.MCU_HYPERBUS0_CSn1 */
-			J721E_WKUP_IOPAD(0x30, PIN_OUTPUT, 1) /* (E19) MCU_OSPI0_CSn1.MCU_HYPERBUS0_RESETn */
-			J721E_WKUP_IOPAD(0x8, PIN_INPUT, 1) /* (D21) MCU_OSPI0_DQS.MCU_HYPERBUS0_RWDS */
-			J721E_WKUP_IOPAD(0xc, PIN_INPUT, 1) /* (D20) MCU_OSPI0_D0.MCU_HYPERBUS0_DQ0 */
-			J721E_WKUP_IOPAD(0x10, PIN_INPUT, 1) /* (G19) MCU_OSPI0_D1.MCU_HYPERBUS0_DQ1 */
-			J721E_WKUP_IOPAD(0x14, PIN_INPUT, 1) /* (G20) MCU_OSPI0_D2.MCU_HYPERBUS0_DQ2 */
-			J721E_WKUP_IOPAD(0x18, PIN_INPUT, 1) /* (F20) MCU_OSPI0_D3.MCU_HYPERBUS0_DQ3 */
-			J721E_WKUP_IOPAD(0x1c, PIN_INPUT, 1) /* (F21) MCU_OSPI0_D4.MCU_HYPERBUS0_DQ4 */
-			J721E_WKUP_IOPAD(0x20, PIN_INPUT, 1) /* (E21) MCU_OSPI0_D5.MCU_HYPERBUS0_DQ5 */
-			J721E_WKUP_IOPAD(0x24, PIN_INPUT, 1) /* (B22) MCU_OSPI0_D6.MCU_HYPERBUS0_DQ6 */
-			J721E_WKUP_IOPAD(0x28, PIN_INPUT, 1) /* (G21) MCU_OSPI0_D7.MCU_HYPERBUS0_DQ7 */
-		>;
-	};
-
-	wkup_gpio_pins_default: wkup-gpio-pins-default {
-		pinctrl-single,pins = <
-			J721E_WKUP_IOPAD(0xd8, PIN_INPUT, 7) /* (C14) WKUP_GPIO0_6 */
-		>;
-	};
-};
-
-&main_pmx0 {
-	bootph-pre-ram;
-
-	main_uart0_pins_default: main_uart0_pins_default {
-		bootph-pre-ram;
-		pinctrl-single,pins = <
-			J721E_IOPAD(0xb0, PIN_INPUT, 0) /* (T16) UART0_RXD */
-			J721E_IOPAD(0xb4, PIN_OUTPUT, 0) /* (T17) UART0_TXD */
-			J721E_IOPAD(0xc0, PIN_INPUT, 2) /* (W3) SPI0_CS0.UART0_CTSn */
-			J721E_IOPAD(0xc4, PIN_OUTPUT, 2) /* (U5) SPI0_CS1.UART0_RTSn */
-		>;
-	};
-
-	main_i2c0_pins_default: main-i2c0-pins-default {
-		bootph-pre-ram;
-		pinctrl-single,pins = <
-			J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */
-			J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */
-		>;
-	};
-
-	main_mmc1_pins_default: main_mmc1_pins_default {
-		pinctrl-single,pins = <
-			J721E_IOPAD(0x104, PIN_INPUT, 0) /* (M20) MMC1_CMD */
-			J721E_IOPAD(0x100, PIN_INPUT, 0) /* (P21) MMC1_CLK */
-			J721E_IOPAD(0xfc, PIN_INPUT, 0) /* (P25) MMC1_CLKLB */
-			J721E_IOPAD(0xf8, PIN_INPUT, 0) /* (M19) MMC1_DAT0 */
-			J721E_IOPAD(0xf4, PIN_INPUT, 0) /* (N21) MMC1_DAT1 */
-			J721E_IOPAD(0xf0, PIN_INPUT, 0) /* (N20) MMC1_DAT2 */
-			J721E_IOPAD(0xec, PIN_INPUT, 0) /* (N19) MMC1_DAT3 */
-			J721E_IOPAD(0xe4, PIN_INPUT, 8) /* (V1) TIMER_IO0.MMC1_SDCD */
-		>;
-	};
-
-	main_usbss0_pins_default: main_usbss0_pins_default {
-		pinctrl-single,pins = <
-			J721E_IOPAD(0x120, PIN_OUTPUT, 0) /* (T4) USB0_DRVVBUS */
-		>;
-	};
-};
-
-&wkup_uart0 {
 	bootph-pre-ram;
-	pinctrl-names = "default";
-	pinctrl-0 = <&wkup_uart0_pins_default>;
-	status = "okay";
-};
-
-&mcu_uart0 {
-	/delete-property/ power-domains;
-	/delete-property/ clocks;
-	/delete-property/ clock-names;
-	pinctrl-names = "default";
-	pinctrl-0 = <&mcu_uart0_pins_default>;
-	status = "okay";
-	clock-frequency = <96000000>;
-};
-
-&main_uart0 {
-	status = "okay";
-	power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&main_uart0_pins_default>;
-	status = "okay";
-};
-
-&main_sdhci0 {
-	/delete-property/ power-domains;
-	/delete-property/ assigned-clocks;
-	/delete-property/ assigned-clock-parents;
-	pinctrl-0 = <&main_mmc1_pins_default>;
-	pinctrl-names = "default";
-	clock-names = "clk_xin";
-	clocks = <&clk_200mhz>;
-	ti,driver-strength-ohm = <50>;
-	non-removable;
-	bus-width = <8>;
-};
-
-&main_sdhci1 {
-	/delete-property/ power-domains;
-	/delete-property/ assigned-clocks;
-	/delete-property/ assigned-clock-parents;
-	clock-names = "clk_xin";
-	clocks = <&clk_200mhz>;
-	ti,driver-strength-ohm = <50>;
-};
Quoted 9 lines

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 253

Quoted 5 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -5
-
-&wkup_i2c0 {
-	bootph-pre-ram;
-	lp876441: lp876441@4c {
-		compatible = "ti,lp876441";

There is no such driver in linux kernel compatible space. might need a ticket to implement the driver.

Interesting - I'll look into it. Makes me wonder about the buck1_reg for wkup_vtm0 and what's going on there.

Quoted 22 lines
Quoted 22 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -20
-		reg = <0x4c>;
-		bootph-pre-ram;
-		pinctrl-names = "default";
-		pinctrl-0 = <&wkup_i2c0_pins_default>;
-		clock-frequency = <400000>;
-
-		regulators: regulators {
-			bootph-pre-ram;
-			buck1_reg: buck1 {
-				/*VDD_CPU_AVS_REG*/
-				regulator-name = "buck1";
-				regulator-min-microvolt = <800000>;
-				regulator-max-microvolt = <1250000>;
-				regulator-always-on;
-				regulator-boot-on;
-				bootph-pre-ram;
-			};
-		};
-	};
-
 };
 
Quoted 8 lines

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 85

Quoted 2 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +1 -0
 &wkup_vtm0 {
+	compatible = "ti,am654-vtm", "ti,j721e-avs";

&wkup_vtm0 -> there is already stuff coming in from kernel. why do we need to define our own compatible "ti,am654-vtm", "ti,j721e-avs"? there is already compatible = "ti,j7200-vtm"; if we need to fix the driver as part of the series, please do as a path in the series.

ti,j7200-vtm doesn't work and throws a "AVS init failed: -19", so i'll work on that. The compatible I used was taken from our TI u-boot

Quoted 4 lines

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 86

Quoted 1 line
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -0
 	vdd-supply-2 = <&buck1_reg>;

Should have been handled in kernel please. Please file an internal tracking ticket for this to be handled.

will do

Quoted 54 lines
Quoted 54 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -51
 	bootph-pre-ram;
 };
-
-&main_i2c0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&main_i2c0_pins_default>;
-	clock-frequency = <400000>;
-
-	exp1: gpio@20 {
-		compatible = "ti,tca6416";
-		reg = <0x20>;
-		gpio-controller;
-		#gpio-cells = <2>;
-	};
-
-	exp2: gpio@22 {
-		compatible = "ti,tca6424";
-		reg = <0x22>;
-		gpio-controller;
-		#gpio-cells = <2>;
-	};
-};
-
-&usbss0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&main_usbss0_pins_default>;
-	ti,vbus-divider;
-	ti,usb2-only;
-};
-
-&usb0 {
-	dr_mode = "otg";
-	maximum-speed = "high-speed";
-};
-
-&hbmc {
-	status = "okay";
-	pinctrl-names = "default";
-	pinctrl-0 = <&mcu_fss0_hpb0_pins_default>;
-	reg = <0x0 0x47040000 0x0 0x100>,
-	      <0x0 0x50000000 0x0 0x8000000>;
-	ranges = <0x0 0x0 0x0 0x50000000 0x4000000>, /* 64MB Flash on CS0 */
-		 <0x1 0x0 0x0 0x54000000 0x800000>; /* 8MB flash on CS1 */
-
-	flash@0,0 {
-		compatible = "cypress,hyperflash", "cfi-flash";
-		reg = <0x0 0x0 0x4000000>;
-	};
-};
-
-&mcu_ringacc {
-	ti,sci = <&dm_tifs>;
-};
Quoted 9 lines

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 335

Quoted 5 lines
arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -5
-
-&mcu_udmap {
-	ti,sci = <&dm_tifs>;
-};
-#include "k3-j7200-common-proc-board-u-boot.dtsi"

https://gist.github.com/nmenon/662262b0256eab004485035a02ede963
is probably the set of changes I commented about above.

Thanks for the feedback!

Quoted 4 lines

arch/arm/mach-k3/j7200/dev-data.c

Quoted 1 line
arch/arm/mach-k3/j7200/dev-data.c +0 -0

Split this out as a separate patch.

will do

Quoted 19 lines
Quoted 14 lines

index 4ddc34210e..8ce6796fd0 100644

arch/arm/mach-k3/j7200/dev-data.c +1 -0
@@ -46,6 +46,7 @@ static struct ti_lpsc soc_lpsc_list[] = {
 
 static struct ti_dev soc_dev_list[] = {
 	PSC_DEV(30, &soc_lpsc_list[0]),
+	PSC_DEV(35, &soc_lpsc_list[0]),
 	PSC_DEV(61, &soc_lpsc_list[1]),
 	PSC_DEV(90, &soc_lpsc_list[2]),
 	PSC_DEV(8, &soc_lpsc_list[3]),
Signature · 1 line
2.34.1
Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#4 lore raw

On 15:01-20230823, reidt wrote:
[...]

Quoted 9 lines
Quoted 8 lines
&mcu_ringacc {
	bootph-pre-ram;
};

NOTE: you only need to override reg-names and reg in R5.dtsi not u-boot.dtsi.

&mcu_udmap {
	bootph-pre-ram;
};
Quoted 7 lines

I saw you mentioned at [0] that mcu_ringacc (and I assume mcu_udmap) need to be retained for now. If moved to r5.dts, something breaks, as dhcp fails then [1]. Should the full nodes remain for now until 6.6-rc1 sync? I'll still take them outside of mcu_navss.

[0] https://lore.kernel.org/all/20230816114445.c4c7rgdp5arhmiaq@polyester/
[1] https://gist.github.com/Glockn/f0cf1ae8f8fd92e70f4e798c6221e81a

True.. But, I understand the overrides are only for the R5 usage when DM is'nt around to support us. So, yes override it in R5 dts - Now why without a A72 override it breaks is beyond me and I'd suggest poking Vignesh or someone more knowledgable about DMA/CPSW for help there.

[..]

Quoted 10 lines
Quoted 7 lines

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi line 124

Quoted 4 lines

&wkup_i2c0 {

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +2 -0
 	bootph-pre-ram;
+
+	lp876441: lp876441@4c {

NAK. Why is this new stuff coming in -> should'nt be here.

This was left because &wkup_vtm0 uses &buck1_reg below which isn't apart of the kernel dt files.

Please send it upstream kernel. What breaks if we keep that out of tree?

My vague recollection is avs0 is mandatory for j7200?

Quoted 9 lines
Quoted 7 lines

hbmc -> arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi: flash@0,0 weird that does'nt throw a dtbs_check warning

WARNING: u-boot,mux-autoprobe -> this is'nt supported.

change these to bootph-pre-ram?

No, I was just surprised to see a new u-boot property.. dont really know what it does. I doubt switching it to bootph-pre-ram will work there.

[...]

Quoted 11 lines
Quoted 8 lines

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 253

Quoted 4 lines

-&wkup_i2c0 {

arch/arm/dts/k3-j7200-r5-common-proc-board.dts +0 -3
-	bootph-pre-ram;
-	lp876441: lp876441@4c {
-		compatible = "ti,lp876441";

There is no such driver in linux kernel compatible space. might need a ticket to implement the driver.

Interesting - I'll look into it. Makes me wonder about the buck1_reg for wkup_vtm0 and what's going on there.

Alright - checkout AVS0 - maybe Keerthy or someone can help guide.

[..]

Quoted 11 lines
Quoted 10 lines

arch/arm/dts/k3-j7200-r5-common-proc-board.dts line 85

Quoted 4 lines

};

&wkup_vtm0 {

arch/arm/dts/k3-j7200-r5-common-proc-board.dts +1 -0
+	compatible = "ti,am654-vtm", "ti,j721e-avs";

&wkup_vtm0 -> there is already stuff coming in from kernel. why do we need to define our own compatible "ti,am654-vtm", "ti,j721e-avs"? there is already compatible = "ti,j7200-vtm"; if we need to fix the driver as part of the series, please do as a path in the series.

Quoted 2 lines

ti,j7200-vtm doesn't work and throws a "AVS init failed: -19", so i'll work on that. The compatible I used was taken from our TI u-boot

Sounds like a driver fixup needed in u-boot to match up with the compatible that was accepted in upstream kernel. Also the classic reason why we are now insisting that the device tree come in from kernel pristine.

[...]

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