Skip to contentSkip to conversation

arm64: dts: ti: k3-am65: Cleanups and minor additions

PATCH Applied Nishanth Menon 3 participants 10 messages Apr 19, 2023 – Jun 6, 2023

Subsystems (2)
lore
Share & tools
lore
author maintainer
#5 lore raw

PATCH 5/7 arm64: dts: ti: k3-am654-base-board: Add board detect eeprom

In reply to Nishanth Menon

Enable AT24CM01 on the base board using the corresponding compatible.

---
 arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +6 -0
index 640910e2280f..c10266077f53 100644
@@ -337,6 +337,12 @@ &wkup_i2c0 {
 	pinctrl-0 = <&wkup_i2c0_pins_default>;
 	clock-frequency = <400000>;
 
+	eeprom@50 {
+		/* AT24CM01 */
+		compatible = "atmel,24c1024";
+		reg = <0x50>;
+	};
+
 	vdd_mpu: regulator@60 {
 		compatible = "ti,tps62363";
 		reg = <0x60>;
Signature · 7 lines
2.40.0


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

Nishanth Menon

author maintainer
#0 lore raw

cover arm64: dts: ti: k3-am65: Cleanups and minor additions

Hi,

This is a result of looking to cleanup u-boot and realizing there are pieces missing in kernel that need to be pushed out.

So, minor cleanups and adding a few missing pieces.

Bootlog: https://gist.github.com/nmenon/f4dc43aef616dfcb3d38701cc074ff6d

Nishanth Menon (7):
arm64: dts: ti: k3-am654-base-board: Add missing pinmux wkup_uart,
mcu_uart and mcu_i2c
arm64: dts: ti: k3-am654-base-board: Rename regulator node name
arm64: dts: ti: k3-am654-base-board: Add VTT GPIO regulator for DDR
arm64: dts: ti: k3-am654-base-board: Add missing PMIC
arm64: dts: ti: k3-am654-base-board: Add board detect eeprom
arm64: dts: ti: k3-am654-base-board: Add aliases
arm64: dts: ti: k3-am65: Drop aliases

 arch/arm64/boot/dts/ti/k3-am65.dtsi           | 17 ----
 .../arm64/boot/dts/ti/k3-am654-base-board.dts | 93 ++++++++++++++++++-
 2 files changed, 88 insertions(+), 22 deletions(-)
Signature · 7 lines
2.40.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#7 lore raw

PATCH 7/7 arm64: dts: ti: k3-am65: Drop aliases

iot boards have always defined their own aliases and with the base-board defining it's own aliases, there are no pending boards depending on common aliases defined in SoC level.

aliases are meant to be defined appropriately based on the exposed interfaces at a board level, drop the aliases defined at SoC level.

---
 arch/arm64/boot/dts/ti/k3-am65.dtsi | 17 -----------------
 1 file changed, 17 deletions(-)
arch/arm64/boot/dts/ti/k3-am65.dtsi +0 -17
index 3093ef6b9b23..4d7b6155a76b 100644
@@ -19,23 +19,6 @@ / {
 	#address-cells = <2>;
 	#size-cells = <2>;
 
-	aliases {
-		serial0 = &wkup_uart0;
-		serial1 = &mcu_uart0;
-		serial2 = &main_uart0;
-		serial3 = &main_uart1;
-		serial4 = &main_uart2;
-		i2c0 = &wkup_i2c0;
-		i2c1 = &mcu_i2c0;
-		i2c2 = &main_i2c0;
-		i2c3 = &main_i2c1;
-		i2c4 = &main_i2c2;
-		i2c5 = &main_i2c3;
-		ethernet0 = &cpsw_port1;
-		mmc0 = &sdhci0;
-		mmc1 = &sdhci1;
-	};
-
 	chosen { };
 
 	firmware {
Signature · 7 lines
2.40.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#4 lore raw

PATCH 4/7 arm64: dts: ti: k3-am654-base-board: Add missing PMIC

In reply to Nishanth Menon

Add the missing vdd_mpu PMIC.

---
 arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 13 +++++++++++++
 1 file changed, 13 insertions(+)
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +13 -0
index 83467adc017d..640910e2280f 100644
@@ -337,6 +337,19 @@ &wkup_i2c0 {
 	pinctrl-0 = <&wkup_i2c0_pins_default>;
 	clock-frequency = <400000>;
 
+	vdd_mpu: regulator@60 {
+		compatible = "ti,tps62363";
+		reg = <0x60>;
+		regulator-name = "VDD_MPU";
+		regulator-min-microvolt = <500000>;
+		regulator-max-microvolt = <1770000>;
+		regulator-always-on;
+		regulator-boot-on;
+		ti,vsel0-state-high;
+		ti,vsel1-state-high;
+		ti,enable-vout-discharge;
+	};
+
 	pca9554: gpio@39 {
 		compatible = "nxp,pca9554";
 		reg = <0x39>;
Signature · 7 lines
2.40.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#6 lore raw

PATCH 6/7 arm64: dts: ti: k3-am654-base-board: Add aliases

In reply to Nishanth Menon

Introduce aliases compatible with the base definition, but focussed on the interfaces that have been exposed on the platform.

---
 arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +14 -0
index c10266077f53..628c72dcec79 100644
@@ -13,6 +13,20 @@ / {
 	compatible = "ti,am654-evm", "ti,am654";
 	model = "Texas Instruments AM654 Base Board";
 
+	aliases {
+		serial0 = &wkup_uart0;
+		serial1 = &mcu_uart0;
+		serial2 = &main_uart0;
+		i2c0 = &wkup_i2c0;
+		i2c1 = &mcu_i2c0;
+		i2c2 = &main_i2c0;
+		i2c3 = &main_i2c1;
+		i2c4 = &main_i2c2;
+		ethernet0 = &cpsw_port1;
+		mmc0 = &sdhci0;
+		mmc1 = &sdhci1;
+	};
+
 	chosen {
 		stdout-path = "serial2:115200n8";
 		bootargs = "earlycon=ns16550a,mmio32,0x02800000";
Signature · 7 lines
2.40.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#3 lore raw

PATCH 3/7 arm64: dts: ti: k3-am654-base-board: Add VTT GPIO regulator for DDR

In reply to Nishanth Menon

Hold the DDR vtt regulator active for functionality.

---
 .../arm64/boot/dts/ti/k3-am654-base-board.dts | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +20 -0
index d3dd6899ef03..83467adc017d 100644
@@ -117,6 +117,20 @@ vdd_mmc1_sd: regulator-2 {
 		vin-supply = <&vcc3v3_io>;
 		gpio = <&pca9554 4 GPIO_ACTIVE_HIGH>;
 	};
+
+	vtt_supply: regulator-3 {
+		compatible = "regulator-fixed";
+		regulator-name = "vtt";
+		pinctrl-names = "default";
+		pinctrl-0 = <&ddr_vtt_pins_default>;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		enable-active-high;
+		regulator-always-on;
+		regulator-boot-on;
+		vin-supply = <&vcc3v3_io>;
+		gpio = <&wkup_gpio0 28 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &wkup_pmx0 {
@@ -129,6 +143,12 @@ AM65X_WKUP_IOPAD(0x00cc, PIN_OUTPUT, 1)	/* (AC1) WKUP_GPIO0_7.WKUP_UART0_RTSn */
 		>;
 	};
 
+	ddr_vtt_pins_default: ddr-vtt-pins-default {
+		pinctrl-single,pins = <
+			AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7)	/* WKUP_GPIO0_28 */
+		>;
+	};
+
 	wkup_i2c0_pins_default: wkup-i2c0-pins-default {
 		pinctrl-single,pins = <
 			AM65X_WKUP_IOPAD(0x00e0, PIN_INPUT, 0) /* (AC7) WKUP_I2C0_SCL */
Signature · 7 lines
2.40.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#1 lore raw

PATCH 1/7 arm64: dts: ti: k3-am654-base-board: Add missing pinmux wkup_uart, mcu_uart and mcu_i2c

In reply to Nishanth Menon

Many of the definitions depend on pinmux done by the bootloader. Be explicit about the pinmux for functionality and completeness.

---
 .../arm64/boot/dts/ti/k3-am654-base-board.dts | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +32 -2
index 592ab2b54cb3..7a79ef51bcc8 100644
@@ -120,6 +120,15 @@ vdd_mmc1_sd: fixedregulator-sd {
 };
 
 &wkup_pmx0 {
+	wkup_uart0_pins_default: wkup-uart0-pins-default {
+		pinctrl-single,pins = <
+			AM65X_WKUP_IOPAD(0x00a0, PIN_INPUT, 0)	/* (AB1) WKUP_UART0_RXD */
+			AM65X_WKUP_IOPAD(0x00a4, PIN_OUTPUT, 0)	/* (AB5) WKUP_UART0_TXD */
+			AM65X_WKUP_IOPAD(0x00c8, PIN_INPUT, 1)	/* (AC2) WKUP_GPIO0_6.WKUP_UART0_CTSn */
+			AM65X_WKUP_IOPAD(0x00cc, PIN_OUTPUT, 1)	/* (AC1) WKUP_GPIO0_7.WKUP_UART0_RTSn */
+		>;
+	};
+
 	wkup_i2c0_pins_default: wkup-i2c0-pins-default {
 		pinctrl-single,pins = <
 			AM65X_WKUP_IOPAD(0x00e0, PIN_INPUT, 0) /* (AC7) WKUP_I2C0_SCL */
@@ -156,6 +165,15 @@ AM65X_WKUP_IOPAD(0x0034, PIN_INPUT, 7) /* (T1) MCU_OSPI1_CLK.WKUP_GPIO0_25 */
 		>;
 	};
 
+	mcu_uart0_pins_default: mcu-uart0-pins-default {
+		pinctrl-single,pins = <
+			AM65X_WKUP_IOPAD(0x0044, PIN_INPUT, 4)	/* (P4) MCU_OSPI1_D1.MCU_UART0_RXD */
+			AM65X_WKUP_IOPAD(0x0048, PIN_OUTPUT, 4)	/* (P5) MCU_OSPI1_D2.MCU_UART0_TXD */
+			AM65X_WKUP_IOPAD(0x004C, PIN_INPUT, 4)	/* (P1) MCU_OSPI1_D3.MCU_UART0_CTSn */
+			AM65X_WKUP_IOPAD(0x0054, PIN_OUTPUT, 4)	/* (N3) MCU_OSPI1_CSn1.MCU_UART0_RTSn */
+		>;
+	};
+
 	mcu_cpsw_pins_default: mcu-cpsw-pins-default {
 		pinctrl-single,pins = <
 			AM65X_WKUP_IOPAD(0x0058, PIN_OUTPUT, 0) /* (N4) MCU_RGMII1_TX_CTL */
@@ -179,6 +197,13 @@ AM65X_WKUP_IOPAD(0x008c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */
 			AM65X_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */
 		>;
 	};
+
+	mcu_i2c0_pins_default: mcu-i2c0-pins-default {
+		pinctrl-single,pins = <
+			AM65X_WKUP_IOPAD(0x00e8, PIN_INPUT,  0) /* (AD8) MCU_I2C0_SCL */
+			AM65X_WKUP_IOPAD(0x00ec, PIN_INPUT,  0) /* (AD7) MCU_I2C0_SDA */
+		>;
+	};
 };
 
 &main_pmx0 {
@@ -269,11 +294,14 @@ AM65X_IOPAD(0x0010, PIN_INPUT, 0) /* (D21) ECAP0_IN_APWM_OUT */
 &wkup_uart0 {
 	/* Wakeup UART is used by System firmware */
 	status = "reserved";
+	pinctrl-names = "default";
+	pinctrl-0 = <&wkup_uart0_pins_default>;
 };
 
 &mcu_uart0 {
 	status = "okay";
-	/* Default pinmux */
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcu_uart0_pins_default>;
 };
 
 &main_uart0 {
@@ -305,7 +333,9 @@ pca9554: gpio@39 {
 
 &mcu_i2c0 {
 	status = "okay";
-	/* Default pinmux */
+	pinctrl-names = "default";
+	pinctrl-0 = <&mcu_i2c0_pins_default>;
+	clock-frequency = <400000>;
 };
 
 &main_i2c0 {
Signature · 7 lines
2.40.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
author maintainer
#2 lore raw

PATCH 2/7 arm64: dts: ti: k3-am654-base-board: 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-am654-base-board.dts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +3 -3
index 7a79ef51bcc8..d3dd6899ef03 100644
@@ -86,7 +86,7 @@ switch-6 {
 		};
 	};
 
-	evm_12v0: fixedregulator-evm12v0 {
+	evm_12v0: regulator-0 {
 		/* main supply */
 		compatible = "regulator-fixed";
 		regulator-name = "evm_12v0";
@@ -96,7 +96,7 @@ evm_12v0: fixedregulator-evm12v0 {
 		regulator-boot-on;
 	};
 
-	vcc3v3_io: fixedregulator-vcc3v3io {
+	vcc3v3_io: regulator-1 {
 		/* Output of TPS54334 */
 		compatible = "regulator-fixed";
 		regulator-name = "vcc3v3_io";
@@ -107,7 +107,7 @@ vcc3v3_io: fixedregulator-vcc3v3io {
 		vin-supply = <&evm_12v0>;
 	};
 
-	vdd_mmc1_sd: fixedregulator-sd {
+	vdd_mmc1_sd: regulator-2 {
 		compatible = "regulator-fixed";
 		regulator-name = "vdd_mmc1_sd";
 		regulator-min-microvolt = <3300000>;
Signature · 7 lines
2.40.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Reviewed-by on the v1 series
#8 lore raw
In reply to Nishanth Menon
Quoted 19 lines · Nishanth Menon

Hi,

This is a result of looking to cleanup u-boot and realizing there are pieces missing in kernel that need to be pushed out.

So, minor cleanups and adding a few missing pieces.

Bootlog: https://gist.github.com/nmenon/f4dc43aef616dfcb3d38701cc074ff6d

Nishanth Menon (7):
arm64: dts: ti: k3-am654-base-board: Add missing pinmux wkup_uart,
mcu_uart and mcu_i2c
arm64: dts: ti: k3-am654-base-board: Rename regulator node name
arm64: dts: ti: k3-am654-base-board: Add VTT GPIO regulator for DDR
arm64: dts: ti: k3-am654-base-board: Add missing PMIC
arm64: dts: ti: k3-am654-base-board: Add board detect eeprom
arm64: dts: ti: k3-am654-base-board: Add aliases
arm64: dts: ti: k3-am65: Drop aliases

Quoted 6 lines
 arch/arm64/boot/dts/ti/k3-am65.dtsi           | 17 ----
 .../arm64/boot/dts/ti/k3-am654-base-board.dts | 93 ++++++++++++++++++-
 2 files changed, 88 insertions(+), 22 deletions(-)
Signature · 1 line
2.40.0

All patches look good to me.

maintainer Applied
#9 lore raw
In reply to Nishanth Menon

Hi Nishanth Menon,

Quoted 8 lines · Nishanth Menon

This is a result of looking to cleanup u-boot and realizing there are pieces missing in kernel that need to be pushed out.

So, minor cleanups and adding a few missing pieces.

Bootlog: https://gist.github.com/nmenon/f4dc43aef616dfcb3d38701cc074ff6d

[...]

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

[1/7] arm64: dts: ti: k3-am654-base-board: Add missing pinmux wkup_uart, mcu_uart and mcu_i2c

      commit: 3ae28642a110485f71091f0a631492e78b396b2b
[2/7] arm64: dts: ti: k3-am654-base-board: Rename regulator node name
      commit: ec1b54824f022a7e65d858abbe74f5d7effc9817
[3/7] arm64: dts: ti: k3-am654-base-board: Add VTT GPIO regulator for DDR
      commit: 5292f504827c56406975b463eda1270d144cf06f
[4/7] arm64: dts: ti: k3-am654-base-board: Add missing PMIC
      commit: 282621ed6e790ccf7288c4c0aadbb34f1fe25c11
[5/7] arm64: dts: ti: k3-am654-base-board: Add board detect eeprom
      commit: 895e2f4f9852e54c0e6d16ddea9882b9b2065eae
[6/7] arm64: dts: ti: k3-am654-base-board: Add aliases
      commit: 692e8888a84357232574caba74f60ceea7364016
[7/7] arm64: dts: ti: k3-am65: Drop aliases
      commit: ffc449e016e269ce4d19e648bae584f8e5afd59f

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