Skip to contentSkip to conversation

AM62x Disable Incomplete DT Nodes

PATCH Applied Andrew Davis 4 participants 14 messages Oct 18, 2022 – Oct 28, 2022

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

cover AM62x Disable Incomplete DT Nodes

Hello all,

Same story as for AM64x[0], this time for AM62x. If there are no objections here then the J7x platforms are next.

Thanks,
Andrew

[0] https://www.spinics.net/lists/arm-kernel/msg1018532.html

Andrew Davis (10):
arm64: dts: ti: k3-am62: Enable UART nodes at the board level
arm64: dts: ti: k3-am62: Enable I2C nodes at the board level
arm64: dts: ti: k3-am62: Enable SPI nodes at the board level
arm64: dts: ti: k3-am62: Enable EPWM nodes at the board level
arm64: dts: ti: k3-am62: Enable ECAP nodes at the board level
arm64: dts: ti: k3-am62: MDIO pinmux should belong to the MDIO node
arm64: dts: ti: k3-am62: Enable MDIO nodes at the board level
arm64: dts: ti: k3-am62: Enable MCAN nodes at the board level
arm64: dts: ti: k3-am62: Enable SDHCI nodes at the board level
arm64: dts: ti: k3-am62: Enable OSPI nodes at the board level

 arch/arm64/boot/dts/ti/k3-am62-main.dtsi   | 26 +++++++
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi    |  4 ++
 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi |  2 +
 arch/arm64/boot/dts/ti/k3-am625-sk.dts     | 81 +++-------------------
 4 files changed, 43 insertions(+), 70 deletions(-)
Signature · 1 line
2.37.3
#1 lore raw

PATCH 1/10 arm64: dts: ti: k3-am62: Enable UART nodes at the board level

UART nodes defined in the top-level AM62x SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information.

As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.

Disable the UART nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.

---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi   |  7 ++++++
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi    |  1 +
 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi |  1 +
 arch/arm64/boot/dts/ti/k3-am625-sk.dts     | 25 +---------------------
 4 files changed, 10 insertions(+), 24 deletions(-)
arch/arm64/boot/dts/ti/k3-am62-main.dtsi +7 -0
index 03660476364f..f6f8ccdb5f55 100644
@@ -199,6 +199,7 @@ main_uart0: serial@2800000 {
 		power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 146 0>;
 		clock-names = "fclk";
+		status = "disabled";
 	};
 
 	main_uart1: serial@2810000 {
@@ -208,6 +209,7 @@ main_uart1: serial@2810000 {
 		power-domains = <&k3_pds 152 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 152 0>;
 		clock-names = "fclk";
+		status = "disabled";
 	};
 
 	main_uart2: serial@2820000 {
@@ -217,6 +219,7 @@ main_uart2: serial@2820000 {
 		power-domains = <&k3_pds 153 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 153 0>;
 		clock-names = "fclk";
+		status = "disabled";
 	};
 
 	main_uart3: serial@2830000 {
@@ -226,6 +229,7 @@ main_uart3: serial@2830000 {
 		power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 154 0>;
 		clock-names = "fclk";
+		status = "disabled";
 	};
 
 	main_uart4: serial@2840000 {
@@ -235,6 +239,7 @@ main_uart4: serial@2840000 {
 		power-domains = <&k3_pds 155 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 155 0>;
 		clock-names = "fclk";
+		status = "disabled";
 	};
 
 	main_uart5: serial@2850000 {
@@ -244,6 +249,7 @@ main_uart5: serial@2850000 {
 		power-domains = <&k3_pds 156 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 156 0>;
 		clock-names = "fclk";
+		status = "disabled";
 	};
 
 	main_uart6: serial@2860000 {
@@ -253,6 +259,7 @@ main_uart6: serial@2860000 {
 		power-domains = <&k3_pds 158 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 158 0>;
 		clock-names = "fclk";
+		status = "disabled";
 	};
 
 	main_i2c0: i2c@20000000 {
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi +1 -0
index f56c803560f2..8dff39723628 100644
@@ -21,6 +21,7 @@ mcu_uart0: serial@4a00000 {
 		power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 149 0>;
 		clock-names = "fclk";
+		status = "disabled";
 	};
 
 	mcu_i2c0: i2c@4900000 {
arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi +1 -0
index 4090134676cf..94cfc549f644 100644
@@ -26,6 +26,7 @@ wkup_uart0: serial@2b300000 {
 		power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 114 0>;
 		clock-names = "fclk";
+		status = "disabled";
 	};
 
 	wkup_i2c0: i2c@2b200000 {
arch/arm64/boot/dts/ti/k3-am625-sk.dts +1 -24
index 93a5f0817efc..0c7b25213e97 100644
@@ -282,11 +282,8 @@ &wkup_uart0 {
 	status = "reserved";
 };
 
-&mcu_uart0 {
-	status = "disabled";
-};
-
 &main_uart0 {
+	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_uart0_pins_default>;
 };
@@ -296,26 +293,6 @@ &main_uart1 {
 	status = "reserved";
 };
 
-&main_uart2 {
-	status = "disabled";
-};
-
-&main_uart3 {
-	status = "disabled";
-};
-
-&main_uart4 {
-	status = "disabled";
-};
-
-&main_uart5 {
-	status = "disabled";
-};
-
-&main_uart6 {
-	status = "disabled";
-};
-
 &mcu_i2c0 {
 	status = "disabled";
 };
Signature · 1 line
2.37.3
#2 lore raw

PATCH 2/10 arm64: dts: ti: k3-am62: Enable I2C nodes at the board level

In reply to Andrew Davis

I2C nodes defined in the top-level AM62x SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information.

As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.

Disable the I2C nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.

---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi   |  4 ++++
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi    |  1 +
 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi |  1 +
 arch/arm64/boot/dts/ti/k3-am625-sk.dts     | 18 ++----------------
 4 files changed, 8 insertions(+), 16 deletions(-)
arch/arm64/boot/dts/ti/k3-am62-main.dtsi +4 -0
index f6f8ccdb5f55..295c9bb22e7d 100644
@@ -271,6 +271,7 @@ main_i2c0: i2c@20000000 {
 		power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 102 2>;
 		clock-names = "fck";
+		status = "disabled";
 	};
 
 	main_i2c1: i2c@20010000 {
@@ -282,6 +283,7 @@ main_i2c1: i2c@20010000 {
 		power-domains = <&k3_pds 103 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 103 2>;
 		clock-names = "fck";
+		status = "disabled";
 	};
 
 	main_i2c2: i2c@20020000 {
@@ -293,6 +295,7 @@ main_i2c2: i2c@20020000 {
 		power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 104 2>;
 		clock-names = "fck";
+		status = "disabled";
 	};
 
 	main_i2c3: i2c@20030000 {
@@ -304,6 +307,7 @@ main_i2c3: i2c@20030000 {
 		power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 105 2>;
 		clock-names = "fck";
+		status = "disabled";
 	};
 
 	main_spi0: spi@20100000 {
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi +1 -0
index 8dff39723628..7f715ebe8e24 100644
@@ -33,6 +33,7 @@ mcu_i2c0: i2c@4900000 {
 		power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 106 2>;
 		clock-names = "fck";
+		status = "disabled";
 	};
 
 	mcu_spi0: spi@4b00000 {
arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi +1 -0
index 94cfc549f644..ff936d547c99 100644
@@ -38,5 +38,6 @@ wkup_i2c0: i2c@2b200000 {
 		power-domains = <&k3_pds 107 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 107 4>;
 		clock-names = "fck";
+		status = "disabled";
 	};
 };
arch/arm64/boot/dts/ti/k3-am625-sk.dts +2 -16
index 0c7b25213e97..c280d6c00412 100644
@@ -293,21 +293,15 @@ &main_uart1 {
 	status = "reserved";
 };
 
-&mcu_i2c0 {
-	status = "disabled";
-};
-
-&wkup_i2c0 {
-	status = "disabled";
-};
-
 &main_i2c0 {
+	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_i2c0_pins_default>;
 	clock-frequency = <400000>;
 };
 
 &main_i2c1 {
+	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_i2c1_pins_default>;
 	clock-frequency = <400000>;
@@ -340,14 +334,6 @@ exp1: gpio@22 {
 	};
 };
 
-&main_i2c2 {
-	status = "disabled";
-};
-
-&main_i2c3 {
-	status = "disabled";
-};
-
 &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
Signature · 1 line
2.37.3
#3 lore raw

PATCH 3/10 arm64: dts: ti: k3-am62: Enable SPI nodes at the board level

In reply to Andrew Davis

SPI nodes defined in the top-level AM62x SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information.

As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.

Disable the SPI nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.

---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 3 +++
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi  | 2 ++
 2 files changed, 5 insertions(+)
arch/arm64/boot/dts/ti/k3-am62-main.dtsi +3 -0
index 295c9bb22e7d..83ac2e45998d 100644
@@ -318,6 +318,7 @@ main_spi0: spi@20100000 {
 		#size-cells = <0>;
 		power-domains = <&k3_pds 141 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 172 0>;
+		status = "disabled";
 	};
 
 	main_spi1: spi@20110000 {
@@ -328,6 +329,7 @@ main_spi1: spi@20110000 {
 		#size-cells = <0>;
 		power-domains = <&k3_pds 142 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 173 0>;
+		status = "disabled";
 	};
 
 	main_spi2: spi@20120000 {
@@ -338,6 +340,7 @@ main_spi2: spi@20120000 {
 		#size-cells = <0>;
 		power-domains = <&k3_pds 143 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 174 0>;
+		status = "disabled";
 	};
 
 	main_gpio_intr: interrupt-controller@a00000 {
arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi +2 -0
index 7f715ebe8e24..28daf476e6a9 100644
@@ -44,6 +44,7 @@ mcu_spi0: spi@4b00000 {
 		#size-cells = <0>;
 		power-domains = <&k3_pds 147 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 147 0>;
+		status = "disabled";
 	};
 
 	mcu_spi1: spi@4b10000 {
@@ -54,6 +55,7 @@ mcu_spi1: spi@4b10000 {
 		#size-cells = <0>;
 		power-domains = <&k3_pds 148 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 148 0>;
+		status = "disabled";
 	};
 
 	mcu_gpio_intr: interrupt-controller@4210000 {
Signature · 1 line
2.37.3
#4 lore raw

PATCH 4/10 arm64: dts: ti: k3-am62: Enable EPWM nodes at the board level

In reply to Andrew Davis

EPWM nodes defined in the top-level AM62x SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information.

As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.

Disable the EPWM nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.

---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi |  3 +++
 arch/arm64/boot/dts/ti/k3-am625-sk.dts   | 12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/ti/k3-am62-main.dtsi +3 -0
index 83ac2e45998d..a0d24faa6833 100644
@@ -612,6 +612,7 @@ epwm0: pwm@23000000 {
 		power-domains = <&k3_pds 86 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&epwm_tbclk 0>, <&k3_clks 86 0>;
 		clock-names = "tbclk", "fck";
+		status = "disabled";
 	};
 
 	epwm1: pwm@23010000 {
@@ -621,6 +622,7 @@ epwm1: pwm@23010000 {
 		power-domains = <&k3_pds 87 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&epwm_tbclk 1>, <&k3_clks 87 0>;
 		clock-names = "tbclk", "fck";
+		status = "disabled";
 	};
 
 	epwm2: pwm@23020000 {
@@ -630,5 +632,6 @@ epwm2: pwm@23020000 {
 		power-domains = <&k3_pds 88 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&epwm_tbclk 2>, <&k3_clks 88 0>;
 		clock-names = "tbclk", "fck";
+		status = "disabled";
 	};
 };
arch/arm64/boot/dts/ti/k3-am625-sk.dts +0 -12
index c280d6c00412..4086d61807ab 100644
@@ -465,15 +465,3 @@ &ecap2 {
 &main_mcan0 {
 	status = "disabled";
 };
-
-&epwm0 {
-	status = "disabled";
-};
-
-&epwm1 {
-	status = "disabled";
-};
-
-&epwm2 {
-	status = "disabled";
-};
Signature · 1 line
2.37.3
#5 lore raw

PATCH 5/10 arm64: dts: ti: k3-am62: Enable ECAP nodes at the board level

In reply to Andrew Davis

ECAP nodes defined in the top-level AM62x SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information. (These and the EPWM nodes could be used to trigger internal actions but they are not used like that currently)

As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.

Disable the ECAP nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.

---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi |  3 +++
 arch/arm64/boot/dts/ti/k3-am625-sk.dts   | 12 ------------
 2 files changed, 3 insertions(+), 12 deletions(-)
arch/arm64/boot/dts/ti/k3-am62-main.dtsi +3 -0
index a0d24faa6833..a580867e68b2 100644
@@ -571,6 +571,7 @@ ecap0: pwm@23100000 {
 		power-domains = <&k3_pds 51 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 51 0>;
 		clock-names = "fck";
+		status = "disabled";
 	};
 
 	ecap1: pwm@23110000 {
@@ -580,6 +581,7 @@ ecap1: pwm@23110000 {
 		power-domains = <&k3_pds 52 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 52 0>;
 		clock-names = "fck";
+		status = "disabled";
 	};
 
 	ecap2: pwm@23120000 {
@@ -589,6 +591,7 @@ ecap2: pwm@23120000 {
 		power-domains = <&k3_pds 53 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 53 0>;
 		clock-names = "fck";
+		status = "disabled";
 	};
 
 	main_mcan0: can@20701000 {
arch/arm64/boot/dts/ti/k3-am625-sk.dts +0 -12
index 4086d61807ab..197d329a6082 100644
@@ -450,18 +450,6 @@ partition@3fc0000 {
 	};
 };
 
-&ecap0 {
-	status = "disabled";
-};
-
-&ecap1 {
-	status = "disabled";
-};
-
-&ecap2 {
-	status = "disabled";
-};
-
 &main_mcan0 {
 	status = "disabled";
 };
Signature · 1 line
2.37.3
#6 lore raw

PATCH 6/10 arm64: dts: ti: k3-am62: MDIO pinmux should belong to the MDIO node

In reply to Andrew Davis

Although usually integrated as a child of an Ethernet controller, MDIO IP has an independent pinout. This pinout should be controlled by the MDIO node (so if it was to be disabled for instance, the pinmux state would reflect that).

Move the MDIO pins pinmux to the MIDO nodes.

---
 arch/arm64/boot/dts/ti/k3-am625-sk.dts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/ti/k3-am625-sk.dts +4 -2
index 197d329a6082..318ec805ff54 100644
@@ -353,8 +353,7 @@ &sdhci1 {
 
 &cpsw3g {
 	pinctrl-names = "default";
-	pinctrl-0 = <&main_mdio1_pins_default
-		     &main_rgmii1_pins_default
+	pinctrl-0 = <&main_rgmii1_pins_default
 		     &main_rgmii2_pins_default>;
 };
 
@@ -369,6 +368,9 @@ &cpsw_port2 {
 };
 
 &cpsw3g_mdio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&main_mdio1_pins_default>;
+
 	cpsw3g_phy0: ethernet-phy@0 {
 		reg = <0>;
 		ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
Signature · 1 line
2.37.3
#7 lore raw

PATCH 7/10 arm64: dts: ti: k3-am62: Enable MDIO nodes at the board level

In reply to Andrew Davis

MDIO nodes defined in the top-level AM62x SoC dtsi files are incomplete and will not be functional unless they are extended with a pinmux.

As the attached PHY is only known about at the board integration level, these nodes should only be enabled when provided with this information.

Disable the MDIO nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.

---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 1 +
 arch/arm64/boot/dts/ti/k3-am625-sk.dts   | 1 +
 2 files changed, 2 insertions(+)
arch/arm64/boot/dts/ti/k3-am62-main.dtsi +1 -0
index a580867e68b2..5169f77cd37a 100644
@@ -534,6 +534,7 @@ cpsw3g_mdio: mdio@f00 {
 			clocks = <&k3_clks 13 0>;
 			clock-names = "fck";
 			bus_freq = <1000000>;
+			status = "disabled";
 		};
 
 		cpts@3d000 {
arch/arm64/boot/dts/ti/k3-am625-sk.dts +1 -0
index 318ec805ff54..b8938eb9c55a 100644
@@ -368,6 +368,7 @@ &cpsw_port2 {
 };
 
 &cpsw3g_mdio {
+	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mdio1_pins_default>;
 
Signature · 1 line
2.37.3
#8 lore raw

PATCH 8/10 arm64: dts: ti: k3-am62: Enable MCAN nodes at the board level

In reply to Andrew Davis

MCAN nodes defined in the top-level AM62x SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information.

As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.

Disable the MCAN nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.

---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 1 +
 arch/arm64/boot/dts/ti/k3-am625-sk.dts   | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)
arch/arm64/boot/dts/ti/k3-am62-main.dtsi +1 -0
index 5169f77cd37a..43eebff429ab 100644
@@ -607,6 +607,7 @@ main_mcan0: can@20701000 {
 			     <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>;
 		interrupt-names = "int0", "int1";
 		bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+		status = "disabled";
 	};
 
 	epwm0: pwm@23000000 {
arch/arm64/boot/dts/ti/k3-am625-sk.dts +0 -4
index b8938eb9c55a..b6d53366ec50 100644
@@ -452,7 +452,3 @@ partition@3fc0000 {
 		};
 	};
 };
-
-&main_mcan0 {
-	status = "disabled";
-};
Signature · 1 line
2.37.3
#9 lore raw

PATCH 9/10 arm64: dts: ti: k3-am62: Enable SDHCI nodes at the board level

In reply to Andrew Davis

SDHCI nodes defined in the top-level AM62x SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information.

As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.

Disable the SDHCI nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.

---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 3 +++
 arch/arm64/boot/dts/ti/k3-am625-sk.dts   | 2 ++
 2 files changed, 5 insertions(+)
arch/arm64/boot/dts/ti/k3-am62-main.dtsi +3 -0
index 43eebff429ab..5a2cd474a761 100644
@@ -407,6 +407,7 @@ sdhci0: mmc@fa10000 {
 		ti,otap-del-sel-mmc-hs = <0x0>;
 		ti,otap-del-sel-ddr52 = <0x9>;
 		ti,otap-del-sel-hs200 = <0x6>;
+		status = "disabled";
 	};
 
 	sdhci1: mmc@fa00000 {
@@ -430,6 +431,7 @@ sdhci1: mmc@fa00000 {
 		ti,itap-del-sel-sdr25 = <0x0>;
 		ti,clkbuf-sel = <0x7>;
 		bus-width = <4>;
+		status = "disabled";
 	};
 
 	sdhci2: mmc@fa20000 {
@@ -452,6 +454,7 @@ sdhci2: mmc@fa20000 {
 		ti,itap-del-sel-sdr12 = <0x0>;
 		ti,itap-del-sel-sdr25 = <0x0>;
 		ti,clkbuf-sel = <0x7>;
+		status = "disabled";
 	};
 
 	fss: bus@fc00000 {
arch/arm64/boot/dts/ti/k3-am625-sk.dts +2 -0
index b6d53366ec50..3c98b639b0b2 100644
@@ -335,6 +335,7 @@ exp1: gpio@22 {
 };
 
 &sdhci0 {
+	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
 	ti,driver-strength-ohm = <50>;
@@ -343,6 +344,7 @@ &sdhci0 {
 
 &sdhci1 {
 	/* SD/MMC */
+	status = "okay";
 	vmmc-supply = <&vdd_mmc1>;
 	vqmmc-supply = <&vdd_sd_dv>;
 	pinctrl-names = "default";
Signature · 1 line
2.37.3
#10 lore raw

PATCH 10/10 arm64: dts: ti: k3-am62: Enable OSPI nodes at the board level

In reply to Andrew Davis

OSPI nodes defined in the top-level AM62x SoC dtsi files are incomplete and will not be functional unless they are extended with pinmux information.

As the pinmux is only known at the board integration level, these nodes should only be enabled when provided with this information.

Disable the OSPI nodes in the dtsi files and only enable the ones that are actually pinned out on a given board.

---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 1 +
 arch/arm64/boot/dts/ti/k3-am625-sk.dts   | 1 +
 2 files changed, 2 insertions(+)
arch/arm64/boot/dts/ti/k3-am62-main.dtsi +1 -0
index 5a2cd474a761..0d04176498fa 100644
@@ -479,6 +479,7 @@ ospi0: spi@fc40000 {
 			power-domains = <&k3_pds 75 TI_SCI_PD_EXCLUSIVE>;
 			#address-cells = <1>;
 			#size-cells = <0>;
+			status = "disabled";
 		};
 	};
 
arch/arm64/boot/dts/ti/k3-am625-sk.dts +1 -0
index 3c98b639b0b2..18ca56cedc63 100644
@@ -397,6 +397,7 @@ mbox_m4_0: mbox-m4-0 {
 };
 
 &ospi0 {
+	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&ospi0_pins_default>;
 
Signature · 1 line
2.37.3
Reviewed-by on the v1 series
#11 lore raw
In reply to Andrew Davis

On October 18, 2022 thus sayeth Andrew Davis:

Quoted 9 lines

Hello all,

Same story as for AM64x[0], this time for AM62x. If there are no objections here then the J7x platforms are next.

Thanks,
Andrew

[0] https://www.spinics.net/lists/arm-kernel/msg1018532.html

Not a lore fan is see ;)

Quoted 13 lines

Andrew Davis (10):
arm64: dts: ti: k3-am62: Enable UART nodes at the board level
arm64: dts: ti: k3-am62: Enable I2C nodes at the board level
arm64: dts: ti: k3-am62: Enable SPI nodes at the board level
arm64: dts: ti: k3-am62: Enable EPWM nodes at the board level
arm64: dts: ti: k3-am62: Enable ECAP nodes at the board level
arm64: dts: ti: k3-am62: MDIO pinmux should belong to the MDIO node
arm64: dts: ti: k3-am62: Enable MDIO nodes at the board level
arm64: dts: ti: k3-am62: Enable MCAN nodes at the board level
arm64: dts: ti: k3-am62: Enable SDHCI nodes at the board level
arm64: dts: ti: k3-am62: Enable OSPI nodes at the board level

Quoted 6 lines
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi   | 26 +++++++
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi    |  4 ++
 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi |  2 +
 arch/arm64/boot/dts/ti/k3-am625-sk.dts     | 81 +++-------------------
 4 files changed, 43 insertions(+), 70 deletions(-)

LGTM!

~Bryan

maintainer Acked-by on the v1 series
#12 lore raw
In reply to Andrew Davis
Quoted 13 lines · Andrew Davis

Andrew Davis (10):
arm64: dts: ti: k3-am62: Enable UART nodes at the board level
arm64: dts: ti: k3-am62: Enable I2C nodes at the board level
arm64: dts: ti: k3-am62: Enable SPI nodes at the board level
arm64: dts: ti: k3-am62: Enable EPWM nodes at the board level
arm64: dts: ti: k3-am62: Enable ECAP nodes at the board level
arm64: dts: ti: k3-am62: MDIO pinmux should belong to the MDIO node
arm64: dts: ti: k3-am62: Enable MDIO nodes at the board level
arm64: dts: ti: k3-am62: Enable MCAN nodes at the board level
arm64: dts: ti: k3-am62: Enable SDHCI nodes at the board level
arm64: dts: ti: k3-am62: Enable OSPI nodes at the board level

Quoted 6 lines
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi   | 26 +++++++
 arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi    |  4 ++
 arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi |  2 +
 arch/arm64/boot/dts/ti/k3-am625-sk.dts     | 81 +++-------------------
 4 files changed, 43 insertions(+), 70 deletions(-)
maintainer Applied
#13 lore raw
In reply to Andrew Davis

Hi Andrew Davis,

Quoted 9 lines · Andrew Davis

Same story as for AM64x[0], this time for AM62x. If there are no objections here then the J7x platforms are next.

Thanks,
Andrew

[0] https://www.spinics.net/lists/arm-kernel/msg1018532.html

[...]

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

[01/10] arm64: dts: ti: k3-am62: Enable UART nodes at the board level

        commit: b5877d9b409cfd5667813e667cbc27192a0fb9ea
[02/10] arm64: dts: ti: k3-am62: Enable I2C nodes at the board level
        commit: a1541a08bbf9d02f842801261d0dd4505bcd29e0
[03/10] arm64: dts: ti: k3-am62: Enable SPI nodes at the board level
        commit: 361e8b7144405b78bd37cc3e9b2d23fc2e2ed6d5
[04/10] arm64: dts: ti: k3-am62: Enable EPWM nodes at the board level
        commit: 6e5474826606a783dd969467f93b0c6a56c39780
[05/10] arm64: dts: ti: k3-am62: Enable ECAP nodes at the board level
        commit: ffd61c16fe8facf56b6fb06e29ba5bd150f01bd9
[06/10] arm64: dts: ti: k3-am62: MDIO pinmux should belong to the MDIO node
        commit: 8709e0442c79c03f7067d6e7464d669504f76527
[07/10] arm64: dts: ti: k3-am62: Enable MDIO nodes at the board level
        commit: 1f737012ce7bd92aecf7d6b1e17742dc7cae7bee
[08/10] arm64: dts: ti: k3-am62: Enable MCAN nodes at the board level
        commit: 2f6d7e18e73d3bd3752ca16d0b3c6b2926809452
[09/10] arm64: dts: ti: k3-am62: Enable SDHCI nodes at the board level
        commit: b2b10301ca685ac23f09d2e663eb4b990b871935
[10/10] arm64: dts: ti: k3-am62: Enable OSPI nodes at the board level
        commit: b0ca32e895680ba94c0ef24a5faa738e536e31cc

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] git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git

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