Skip to contentSkip to conversation

arm64: dts: ti: k3-am64: Add missing properties used in u-boot

PATCH Applied Nishanth Menon 3 participants 13 messages Apr 14, 2023 – Jun 6, 2023

Subsystems (2)
lore
Share & tools
lore

Nishanth Menon

author maintainer
#0 lore raw

cover arm64: dts: ti: k3-am64: Add missing properties used in u-boot

Hi,

while attempting to cleanup u-boot, I noticed that u-boot had some additional nodes that were'nt in kernel.org, and this makes syncing the kernel.org patches back to u-boot hard.

So, sync the same.

Bootlogs: (SK and evm)
https://gist.github.com/nmenon/6b09f55251225d3f3cce076c32a33bba

Baseline: next-20230413 (will be great if we can get into rc2 - will make u-boot sync easier)

Nishanth Menon (10):
arm64: dts: ti: k3-am64: Add general purpose timers
arm64: dts: ti: k3-am642-sk: Fix mmc1 pinmux
arm64: dts: ti: k3-am642-sk: Enable main_i2c0 and eeprom
arm64: dts: ti: k3-am642-sk: Describe main_uart1 pins
arm64: dts: ti: k3-am642-sk: Rename regulator node name
arm64: dts: ti: k3-am642-evm: Enable main_i2c0 and eeprom
arm64: dts: ti: k3-am642-evm: Describe main_uart1 pins
arm64: dts: ti: k3-am642-evm: Rename regulator node name
arm64: dts: ti: k3-am642-evm: Add VTT GPIO regulator for DDR
arm64: dts: ti: k3-am642-sk|evm: Drop bootargs, add aliases

 arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 144 +++++++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi  |  45 +++++++
 arch/arm64/boot/dts/ti/k3-am64.dtsi      |  16 ---
 arch/arm64/boot/dts/ti/k3-am642-evm.dts  |  76 ++++++++++--
 arch/arm64/boot/dts/ti/k3-am642-sk.dts   |  69 ++++++++---
 5 files changed, 313 insertions(+), 37 deletions(-)
Signature · 1 line
2.40.0
author maintainer
#1 lore raw

PATCH 1/10 arm64: dts: ti: k3-am64: Add general purpose timers

There are 11 general purpose timers on am64 that can be used for things like PWM using pwm-omap-dmtimer driver. There are also additional four timers in the MCU domain that do not have interrupts routable for Linux.

We configure the timers with the 25 MHz input clock by default as the 32.768 kHz clock may not be wired on the device. We leave the MCU domain timers clock mux unconfigured, and mark the MCU domain timers reserved. The MCU domain timers are likely reserved by the software for the ESM module.

Compared to am65, the timers on am64 do not have a dedicated IO mux for the timers. On am62, the timers have different interrupts, clocks and power domains compared to am65, and the MCU timers are at a different IO address. Compared to AM62, the AM64 times have different clocks and count in main domain are different as well.

---
 arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 144 +++++++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi  |  45 +++++++
 2 files changed, 189 insertions(+)
arch/arm64/boot/dts/ti/k3-am64-main.dtsi +144 -0
index 5e8036f32d79..f5e25d6c3c28 100644
@@ -228,6 +228,150 @@ epwm_tbclk: clock@4140 {
 		};
 	};
 
+	main_timer0: timer@2400000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x2400000 0x00 0x400>;
+		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 36 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 36 1>;
+		assigned-clock-parents = <&k3_clks 36 2>;
+		power-domains = <&k3_pds 36 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer1: timer@2410000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x2410000 0x00 0x400>;
+		interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 37 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 37 1>;
+		assigned-clock-parents = <&k3_clks 37 2>;
+		power-domains = <&k3_pds 37 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer2: timer@2420000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x2420000 0x00 0x400>;
+		interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 38 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 38 1>;
+		assigned-clock-parents = <&k3_clks 38 2>;
+		power-domains = <&k3_pds 38 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer3: timer@2430000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x2430000 0x00 0x400>;
+		interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 39 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 39 1>;
+		assigned-clock-parents = <&k3_clks 39 2>;
+		power-domains = <&k3_pds 39 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer4: timer@2440000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x2440000 0x00 0x400>;
+		interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 40 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 40 1>;
+		assigned-clock-parents = <&k3_clks 40 2>;
+		power-domains = <&k3_pds 40 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer5: timer@2450000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x2450000 0x00 0x400>;
+		interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 41 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 41 1>;
+		assigned-clock-parents = <&k3_clks 41 2>;
+		power-domains = <&k3_pds 41 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer6: timer@2460000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x2460000 0x00 0x400>;
+		interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 42 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 42 1>;
+		assigned-clock-parents = <&k3_clks 42 2>;
+		power-domains = <&k3_pds 42 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer7: timer@2470000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x2470000 0x00 0x400>;
+		interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 43 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 43 1>;
+		assigned-clock-parents = <&k3_clks 43 2>;
+		power-domains = <&k3_pds 43 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer8: timer@2480000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x2480000 0x00 0x400>;
+		interrupts = <GIC_SPI 128 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 44 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 44 1>;
+		assigned-clock-parents = <&k3_clks 44 2>;
+		power-domains = <&k3_pds 44 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer9: timer@2490000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x2490000 0x00 0x400>;
+		interrupts = <GIC_SPI 129 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 45 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 45 1>;
+		assigned-clock-parents = <&k3_clks 45 2>;
+		power-domains = <&k3_pds 45 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer10: timer@24a0000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x24a0000 0x00 0x400>;
+		interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 46 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 46 1>;
+		assigned-clock-parents = <&k3_clks 46 2>;
+		power-domains = <&k3_pds 46 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
+	main_timer11: timer@24b0000 {
+		compatible = "ti,am654-timer";
+		reg = <0x00 0x24b0000 0x00 0x400>;
+		interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&k3_clks 47 1>;
+		clock-names = "fck";
+		assigned-clocks = <&k3_clks 47 1>;
+		assigned-clock-parents = <&k3_clks 47 2>;
+		power-domains = <&k3_pds 47 TI_SCI_PD_EXCLUSIVE>;
+		ti,timer-pwm;
+	};
+
 	main_uart0: serial@2800000 {
 		compatible = "ti,am64-uart", "ti,am654-uart";
 		reg = <0x00 0x02800000 0x00 0x100>;
arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi +45 -0

51 lines not on this page · raw message

Signature · 1 line
2.40.0
author maintainer
#2 lore raw

PATCH 2/10 arm64: dts: ti: k3-am642-sk: Fix mmc1 pinmux

In reply to Nishanth Menon

Fix the pinmux for pulldirection to get stable sdcard behavior.

---
 arch/arm64/boot/dts/ti/k3-am642-sk.dts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/ti/k3-am642-sk.dts +8 -7
index 2e2d40da360a..9a65f9b1c9ab 100644
@@ -224,14 +224,15 @@ led-7 {
 &main_pmx0 {
 	main_mmc1_pins_default: main-mmc1-pins-default {
 		pinctrl-single,pins = <
-			AM64X_IOPAD(0x0294, PIN_INPUT, 0) /* (J19) MMC1_CMD */
+			AM64X_IOPAD(0x029c, PIN_INPUT_PULLUP, 0) /* (C20) MMC1_SDWP */
+			AM64X_IOPAD(0x0298, PIN_INPUT_PULLUP, 0) /* (D19) MMC1_SDCD */
+			AM64X_IOPAD(0x0294, PIN_INPUT_PULLUP, 0) /* (J19) MMC1_CMD */
 			AM64X_IOPAD(0x0290, PIN_INPUT, 0) /* (#N/A) MMC1_CLKLB */
-			AM64X_IOPAD(0x028c, PIN_INPUT, 0) /* (L20) MMC1_CLK */
-			AM64X_IOPAD(0x0288, PIN_INPUT, 0) /* (K21) MMC1_DAT0 */
-			AM64X_IOPAD(0x0284, PIN_INPUT, 0) /* (L21) MMC1_DAT1 */
-			AM64X_IOPAD(0x0280, PIN_INPUT, 0) /* (K19) MMC1_DAT2 */
-			AM64X_IOPAD(0x027c, PIN_INPUT, 0) /* (K18) MMC1_DAT3 */
-			AM64X_IOPAD(0x0298, PIN_INPUT, 0) /* (D19) MMC1_SDCD */
+			AM64X_IOPAD(0x028c, PIN_INPUT_PULLDOWN, 0) /* (L20) MMC1_CLK */
+			AM64X_IOPAD(0x0288, PIN_INPUT_PULLUP, 0) /* (K21) MMC1_DAT0 */
+			AM64X_IOPAD(0x0284, PIN_INPUT_PULLUP, 0) /* (L21) MMC1_DAT1 */
+			AM64X_IOPAD(0x0280, PIN_INPUT_PULLUP, 0) /* (K19) MMC1_DAT2 */
+			AM64X_IOPAD(0x027c, PIN_INPUT_PULLUP, 0) /* (K18) MMC1_DAT3 */
 		>;
 	};
 
Signature · 1 line
2.40.0
author maintainer
#3 lore raw

PATCH 3/10 arm64: dts: ti: k3-am642-sk: Enable main_i2c0 and eeprom

In reply to Nishanth Menon

Enable AT24C512C on the base board.

---
 arch/arm64/boot/dts/ti/k3-am642-sk.dts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
arch/arm64/boot/dts/ti/k3-am642-sk.dts +19 -0
index 9a65f9b1c9ab..3e16942c0add 100644
@@ -251,6 +251,13 @@ AM64X_IOPAD(0x02a8, PIN_OUTPUT, 0) /* (E19) USB0_DRVVBUS */
 		>;
 	};
 
+	main_i2c0_pins_default: main-i2c0-pins-default {
+		pinctrl-single,pins = <
+			AM64X_IOPAD(0x0260, PIN_INPUT_PULLUP, 0) /* (A18) I2C0_SCL */
+			AM64X_IOPAD(0x0264, PIN_INPUT_PULLUP, 0) /* (B18) I2C0_SDA */
+		>;
+	};
+
 	main_i2c1_pins_default: main-i2c1-pins-default {
 		pinctrl-single,pins = <
 			AM64X_IOPAD(0x0268, PIN_INPUT_PULLUP, 0) /* (C18) I2C1_SCL */
@@ -350,6 +357,18 @@ &main_uart1 {
 	status = "reserved";
 };
 
+&main_i2c0 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&main_i2c0_pins_default>;
+	clock-frequency = <400000>;
+
+	eeprom@51 {
+		compatible = "atmel,24c512";
+		reg = <0x51>;
+	};
+};
+
 &main_i2c1 {
 	status = "okay";
 	pinctrl-names = "default";
Signature · 1 line
2.40.0
author maintainer
#4 lore raw

PATCH 4/10 arm64: dts: ti: k3-am642-sk: Describe main_uart1 pins

In reply to Nishanth Menon

Describe the main_uart1 pins even though it is a reserved node for hardware complete description. This is used by other users of device tree to help configure the SoC per board requirements.

---
 arch/arm64/boot/dts/ti/k3-am642-sk.dts | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm64/boot/dts/ti/k3-am642-sk.dts +11 -0
index 3e16942c0add..da4121b2e2c6 100644
@@ -245,6 +245,15 @@ AM64X_IOPAD(0x0234, PIN_OUTPUT, 0) /* (C16) UART0_TXD */
 		>;
 	};
 
+	main_uart1_pins_default: main-uart1-pins-default {
+		pinctrl-single,pins = <
+			AM64X_IOPAD(0x0248, PIN_INPUT, 0) /* (D16) UART1_CTSn */
+			AM64X_IOPAD(0x024c, PIN_OUTPUT, 0) /* (E16) UART1_RTSn */
+			AM64X_IOPAD(0x0240, PIN_INPUT, 0) /* (E15) UART1_RXD */
+			AM64X_IOPAD(0x0244, PIN_OUTPUT, 0) /* (E14) UART1_TXD */
+		>;
+	};
+
 	main_usb0_pins_default: main-usb0-pins-default {
 		pinctrl-single,pins = <
 			AM64X_IOPAD(0x02a8, PIN_OUTPUT, 0) /* (E19) USB0_DRVVBUS */
@@ -355,6 +364,8 @@ &main_uart0 {
 &main_uart1 {
 	/* main_uart1 is reserved for firmware usage */
 	status = "reserved";
+	pinctrl-names = "default";
+	pinctrl-0 = <&main_uart1_pins_default>;
 };
 
 &main_i2c0 {
Signature · 1 line
2.40.0
author maintainer
#5 lore raw

PATCH 5/10 arm64: dts: ti: k3-am642-sk: Rename regulator node name

In reply to Nishanth Menon

Rename the regulator node names to the standard regulator-0.. numbers.

---
 arch/arm64/boot/dts/ti/k3-am642-sk.dts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/ti/k3-am642-sk.dts +5 -5
index da4121b2e2c6..5bd69a8e8063 100644
@@ -94,7 +94,7 @@ rtos_ipc_memory_region: ipc-memories@a5000000 {
 		};
 	};
 
-	vusb_main: fixed-regulator-vusb-main5v0 {
+	vusb_main: regulator-0 {
 		/* USB MAIN INPUT 5V DC */
 		compatible = "regulator-fixed";
 		regulator-name = "vusb_main5v0";
@@ -104,7 +104,7 @@ vusb_main: fixed-regulator-vusb-main5v0 {
 		regulator-boot-on;
 	};
 
-	vcc_3v3_sys: fixedregulator-vcc-3v3-sys {
+	vcc_3v3_sys: regulator-1 {
 		/* output of LP8733xx */
 		compatible = "regulator-fixed";
 		regulator-name = "vcc_3v3_sys";
@@ -115,7 +115,7 @@ vcc_3v3_sys: fixedregulator-vcc-3v3-sys {
 		regulator-boot-on;
 	};
 
-	vdd_mmc1: fixed-regulator-sd {
+	vdd_mmc1: regulator-2 {
 		/* TPS2051BD */
 		compatible = "regulator-fixed";
 		regulator-name = "vdd_mmc1";
@@ -127,7 +127,7 @@ vdd_mmc1: fixed-regulator-sd {
 		gpio = <&exp1 3 GPIO_ACTIVE_HIGH>;
 	};
 
-	com8_ls_en: regulator-1 {
+	com8_ls_en: regulator-3 {
 		compatible = "regulator-fixed";
 		regulator-name = "com8_ls_en";
 		regulator-min-microvolt = <3300000>;
@@ -139,7 +139,7 @@ com8_ls_en: regulator-1 {
 		gpio = <&main_gpio0 62 GPIO_ACTIVE_LOW>;
 	};
 
-	wlan_en: regulator-2 {
+	wlan_en: regulator-4 {
 		/* output of SN74AVC4T245RSVR */
 		compatible = "regulator-fixed";
 		regulator-name = "wlan_en";
Signature · 1 line
2.40.0
author maintainer
#6 lore raw

PATCH 6/10 arm64: dts: ti: k3-am642-evm: Enable main_i2c0 and eeprom

In reply to Nishanth Menon

Enable AT24CM01 on the base board using the corresponding compatible.

---

Note:
checkpatch does a simple pattern search and fails to find a match #47: FILE: arch/arm64/boot/dts/ti/k3-am642-evm.dts:353:

		compatible = "atmel,24c1024";

But, Documentation/devicetree/bindings/eeprom/at24.yaml
- items:
pattern: cs1024$
Cleanly covers the same and dtbs_check looks clean.

 arch/arm64/boot/dts/ti/k3-am642-evm.dts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
arch/arm64/boot/dts/ti/k3-am642-evm.dts +20 -0
index 39feea78a084..6456cc6d739b 100644
@@ -233,6 +233,13 @@ AM64X_IOPAD(0x0218, PIN_INPUT, 0) /* (A14) SPI0_D1 */
 		>;
 	};
 
+	main_i2c0_pins_default: main-i2c0-pins-default {
+		pinctrl-single,pins = <
+			AM64X_IOPAD(0x0260, PIN_INPUT_PULLUP, 0) /* (A18) I2C0_SCL */
+			AM64X_IOPAD(0x0264, PIN_INPUT_PULLUP, 0) /* (B18) I2C0_SDA */
+		>;
+	};
+
 	main_i2c1_pins_default: main-i2c1-pins-default {
 		pinctrl-single,pins = <
 			AM64X_IOPAD(0x0268, PIN_INPUT_PULLUP, 0) /* (C18) I2C1_SCL */
@@ -335,6 +342,19 @@ &main_uart1 {
 	status = "reserved";
 };
 
+&main_i2c0 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&main_i2c0_pins_default>;
+	clock-frequency = <400000>;
+
+	eeprom@50 {
+		/* AT24CM01 */
+		compatible = "atmel,24c1024";
+		reg = <0x50>;
+	};
+};
+
 &main_i2c1 {
 	status = "okay";
 	pinctrl-names = "default";
Signature · 1 line
2.40.0
author maintainer
#7 lore raw

PATCH 7/10 arm64: dts: ti: k3-am642-evm: Describe main_uart1 pins

In reply to Nishanth Menon

Describe the main_uart1 pins even though it is a reserved node for hardware complete description. This is used by other users of device tree to help configure the SoC per board requirements.

---
 arch/arm64/boot/dts/ti/k3-am642-evm.dts | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm64/boot/dts/ti/k3-am642-evm.dts +11 -0
index 6456cc6d739b..a1ed102a69f1 100644
@@ -215,6 +215,15 @@ AM64X_IOPAD(0x0290, PIN_INPUT, 0) /* MMC1_CLKLB */
 		>;
 	};
 
+	main_uart1_pins_default: main-uart1-pins-default {
+		pinctrl-single,pins = <
+			AM64X_IOPAD(0x0248, PIN_INPUT, 0)		/* (D16) UART1_CTSn */
+			AM64X_IOPAD(0x024c, PIN_OUTPUT, 0)		/* (E16) UART1_RTSn */
+			AM64X_IOPAD(0x0240, PIN_INPUT, 0)		/* (E15) UART1_RXD */
+			AM64X_IOPAD(0x0244, PIN_OUTPUT, 0)		/* (E14) UART1_TXD */
+		>;
+	};
+
 	main_uart0_pins_default: main-uart0-pins-default {
 		pinctrl-single,pins = <
 			AM64X_IOPAD(0x0238, PIN_INPUT, 0) /* (B16) UART0_CTSn */
@@ -340,6 +349,8 @@ &main_uart0 {
 /* main_uart1 is reserved for firmware usage */
 &main_uart1 {
 	status = "reserved";
+	pinctrl-names = "default";
+	pinctrl-0 = <&main_uart1_pins_default>;
 };
 
 &main_i2c0 {
Signature · 1 line
2.40.0
author maintainer
#8 lore raw

PATCH 8/10 arm64: dts: ti: k3-am642-evm: Rename regulator node name

In reply to Nishanth Menon

Rename the regulator node names to the standard regulator-0.. numbers.

---
 arch/arm64/boot/dts/ti/k3-am642-evm.dts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm64/boot/dts/ti/k3-am642-evm.dts +5 -5
index a1ed102a69f1..9cf181d0199f 100644
@@ -94,7 +94,7 @@ rtos_ipc_memory_region: ipc-memories@a5000000 {
 		};
 	};
 
-	evm_12v0: fixedregulator-evm12v0 {
+	evm_12v0: regulator-0 {
 		/* main DC jack */
 		compatible = "regulator-fixed";
 		regulator-name = "evm_12v0";
@@ -104,7 +104,7 @@ evm_12v0: fixedregulator-evm12v0 {
 		regulator-boot-on;
 	};
 
-	vsys_5v0: fixedregulator-vsys5v0 {
+	vsys_5v0: regulator-1 {
 		/* output of LM5140 */
 		compatible = "regulator-fixed";
 		regulator-name = "vsys_5v0";
@@ -115,7 +115,7 @@ vsys_5v0: fixedregulator-vsys5v0 {
 		regulator-boot-on;
 	};
 
-	vsys_3v3: fixedregulator-vsys3v3 {
+	vsys_3v3: regulator-2 {
 		/* output of LM5140 */
 		compatible = "regulator-fixed";
 		regulator-name = "vsys_3v3";
@@ -126,7 +126,7 @@ vsys_3v3: fixedregulator-vsys3v3 {
 		regulator-boot-on;
 	};
 
-	vdd_mmc1: fixed-regulator-sd {
+	vdd_mmc1: regulator-3 {
 		/* TPS2051BD */
 		compatible = "regulator-fixed";
 		regulator-name = "vdd_mmc1";
@@ -138,7 +138,7 @@ vdd_mmc1: fixed-regulator-sd {
 		gpio = <&exp1 6 GPIO_ACTIVE_HIGH>;
 	};
 
-	vddb: fixedregulator-vddb {
+	vddb: regulator-4 {
 		compatible = "regulator-fixed";
 		regulator-name = "vddb_3v3_display";
 		regulator-min-microvolt = <3300000>;
Signature · 1 line
2.40.0
author maintainer
#9 lore raw

PATCH 9/10 arm64: dts: ti: k3-am642-evm: Add VTT GPIO regulator for DDR

In reply to Nishanth Menon

Hold the DDR vtt regulator active for functionality.

---
 arch/arm64/boot/dts/ti/k3-am642-evm.dts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
arch/arm64/boot/dts/ti/k3-am642-evm.dts +20 -0
index 9cf181d0199f..3d0b473d5252 100644
@@ -148,6 +148,20 @@ vddb: regulator-4 {
 		regulator-boot-on;
 	};
 
+	vtt_supply: regulator-5 {
+		compatible = "regulator-fixed";
+		regulator-name = "vtt";
+		pinctrl-names = "default";
+		pinctrl-0 = <&ddr_vtt_pins_default>;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&main_gpio0 12 GPIO_ACTIVE_HIGH>;
+		vin-supply = <&vsys_3v3>;
+		enable-active-high;
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 
@@ -338,6 +352,12 @@ AM64X_IOPAD(0x025c, PIN_INPUT, 0) /* (D17) MCAN1_RX */
 			AM64X_IOPAD(0x0258, PIN_OUTPUT, 0) /* (C17) MCAN1_TX */
 		>;
 	};
+
+	ddr_vtt_pins_default: ddr-vtt-pins-default {
+		pinctrl-single,pins = <
+			AM64X_IOPAD(0x0030, PIN_OUTPUT_PULLUP, 7) /* (L18) OSPI0_CSN1.GPIO0_12 */
+		>;
+	};
 };
 
 &main_uart0 {
Signature · 1 line
2.40.0
author maintainer
#10 lore raw

PATCH 10/10 arm64: dts: ti: k3-am642-sk|evm: Drop bootargs, add aliases

In reply to Nishanth Menon

Drop bootargs and add aliases based on base pinout of SK as per [1] and evm per [2].

Indices chosen attempt to maintain some level of consistency with existing aliases.

While at this, drop a extra EoL. While this patch could be split, it seems trivial to add additional cleanup steps.

[1] https://www.ti.com/lit/df/sprr432/sprr432.pdf
[2] https://www.ti.com/lit/zip/swrr171

---
 arch/arm64/boot/dts/ti/k3-am64.dtsi     | 16 ----------------
 arch/arm64/boot/dts/ti/k3-am642-evm.dts | 15 +++++++++++++--
 arch/arm64/boot/dts/ti/k3-am642-sk.dts  | 14 ++++++++++++--
 3 files changed, 25 insertions(+), 20 deletions(-)
arch/arm64/boot/dts/ti/k3-am64.dtsi +0 -16
index 60fe95b48312..d6262b5a0a10 100644
@@ -19,22 +19,6 @@ / {
 	#address-cells = <2>;
 	#size-cells = <2>;
 
-	aliases {
-		serial0 = &mcu_uart0;
-		serial1 = &mcu_uart1;
-		serial2 = &main_uart0;
-		serial3 = &main_uart1;
-		serial4 = &main_uart2;
-		serial5 = &main_uart3;
-		serial6 = &main_uart4;
-		serial7 = &main_uart5;
-		serial8 = &main_uart6;
-		ethernet0 = &cpsw_port1;
-		ethernet1 = &cpsw_port2;
-		mmc0 = &sdhci0;
-		mmc1 = &sdhci1;
-	};
-
 	chosen { };
 
 	firmware {
arch/arm64/boot/dts/ti/k3-am642-evm.dts +13 -2
index 3d0b473d5252..3db740f78cd2 100644
@@ -18,14 +18,25 @@ / {
 
 	chosen {
 		stdout-path = "serial2:115200n8";
-		bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
+	};
+
+	aliases {
+		serial0 = &mcu_uart0;
+		serial1 = &main_uart1;
+		serial2 = &main_uart0;
+		serial3 = &main_uart3;
+		i2c0 = &main_i2c0;
+		i2c1 = &main_i2c1;
+		mmc0 = &sdhci0;
+		mmc1 = &sdhci1;
+		ethernet0 = &cpsw_port1;
+		ethernet1 = &cpsw_port2;
 	};
 
 	memory@80000000 {
 		device_type = "memory";
 		/* 2G RAM */
 		reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
-
 	};
 
 	reserved-memory {
arch/arm64/boot/dts/ti/k3-am642-sk.dts +12 -2
index 5bd69a8e8063..003cff9a2799 100644
@@ -18,14 +18,24 @@ / {
 
 	chosen {
 		stdout-path = "serial2:115200n8";
-		bootargs = "console=ttyS2,115200n8 earlycon=ns16550a,mmio32,0x02800000";
+	};
+
+	aliases {
+		serial0 = &mcu_uart0;
+		serial1 = &main_uart1;
+		serial2 = &main_uart0;
+		i2c0 = &main_i2c0;
+		i2c1 = &main_i2c1;
+		mmc0 = &sdhci0;
+		mmc1 = &sdhci1;
+		ethernet0 = &cpsw_port1;
+		ethernet1 = &cpsw_port2;
 	};
 
 	memory@80000000 {
 		device_type = "memory";
 		/* 2G RAM */
 		reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
-
 	};
 
 	reserved-memory {
Signature · 1 line
2.40.0
Reviewed-by on the v1 series
#11 lore raw
In reply to Nishanth Menon
Quoted 26 lines · Nishanth Menon

Hi,

while attempting to cleanup u-boot, I noticed that u-boot had some additional nodes that were'nt in kernel.org, and this makes syncing the kernel.org patches back to u-boot hard.

So, sync the same.

Bootlogs: (SK and evm)
https://gist.github.com/nmenon/6b09f55251225d3f3cce076c32a33bba

Baseline: next-20230413 (will be great if we can get into rc2 - will make u-boot sync easier)

Nishanth Menon (10):
arm64: dts: ti: k3-am64: Add general purpose timers
arm64: dts: ti: k3-am642-sk: Fix mmc1 pinmux
arm64: dts: ti: k3-am642-sk: Enable main_i2c0 and eeprom
arm64: dts: ti: k3-am642-sk: Describe main_uart1 pins
arm64: dts: ti: k3-am642-sk: Rename regulator node name
arm64: dts: ti: k3-am642-evm: Enable main_i2c0 and eeprom
arm64: dts: ti: k3-am642-evm: Describe main_uart1 pins
arm64: dts: ti: k3-am642-evm: Rename regulator node name
arm64: dts: ti: k3-am642-evm: Add VTT GPIO regulator for DDR
arm64: dts: ti: k3-am642-sk|evm: Drop bootargs, add aliases

Quoted 7 lines
 arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 144 +++++++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi  |  45 +++++++
 arch/arm64/boot/dts/ti/k3-am64.dtsi      |  16 ---
 arch/arm64/boot/dts/ti/k3-am642-evm.dts  |  76 ++++++++++--
 arch/arm64/boot/dts/ti/k3-am642-sk.dts   |  69 ++++++++---
 5 files changed, 313 insertions(+), 37 deletions(-)

for this series:

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

maintainer Applied
#12 lore raw
In reply to Nishanth Menon

Hi Nishanth Menon,

Quoted 10 lines · Nishanth Menon

while attempting to cleanup u-boot, I noticed that u-boot had some additional nodes that were'nt in kernel.org, and this makes syncing the kernel.org patches back to u-boot hard.

So, sync the same.

Bootlogs: (SK and evm)
https://gist.github.com/nmenon/6b09f55251225d3f3cce076c32a33bba

[...]

I have applied the following to branch ti-k3-dts-next on [1]. Thank you!

[01/10] arm64: dts: ti: k3-am64: Add general purpose timers

        commit: 9972b45776aba937d0db67f8080ec627a924f56e
[02/10] arm64: dts: ti: k3-am642-sk: Fix mmc1 pinmux
        commit: 744545ffec14f74f26f57828afa685f6f4eadd9e
[03/10] arm64: dts: ti: k3-am642-sk: Enable main_i2c0 and eeprom
        commit: 1d79ca01e62096e87686244cdf4864f338ccd200
[04/10] arm64: dts: ti: k3-am642-sk: Describe main_uart1 pins
        commit: c8da2f207168d2c93f7fa7bff92f6b395c342e4a
[05/10] arm64: dts: ti: k3-am642-sk: Rename regulator node name
        commit: 826b6679bd08694ad7a830eb30608c3e5a780941
[06/10] arm64: dts: ti: k3-am642-evm: Enable main_i2c0 and eeprom
        commit: cf3b25bc3cc0b66cfaae9614620228a5c2246ecb
[07/10] arm64: dts: ti: k3-am642-evm: Describe main_uart1 pins
        commit: e3e1d9ab65ebbd95907b6951637cd6809c69afc7
[08/10] arm64: dts: ti: k3-am642-evm: Rename regulator node name
        commit: 61ee5572075dfc16b480103763091b603cb06aa1
[09/10] arm64: dts: ti: k3-am642-evm: Add VTT GPIO regulator for DDR
        commit: aca16cefdd25cdcd284212f840b70b07101f2548
[10/10] arm64: dts: ti: k3-am642-sk|evm: Drop bootargs, add aliases
        commit: bb3d657872215942cf87dd194904a7543fce3cc4

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent up the chain during the next merge window (or sooner if it is a relevant bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
--
Vignesh