Skip to content

Commit 0a82d3d

Browse files
arndbarndb
committed
Merge tag 'ti-k3-dt-for-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
TI K3 device tree updates for v6.20 Generic Fixes/Cleanups: - Minor whitespace cleanup and lowercase hex formatting for consistency - Various DT schema warning fixes across multiple boards SoC Specific Features and Fixes: AM62P/J722S: - Add HSM M4F node for hardware security module support J784S4/J742S2/J721S2: - Add HSM M4F node for hardware security module support - Refactor watchdog instances for j784s4 - Move c71_3 node to appropriate order in device tree Board Specific Fixes: AM62: - phycore-som: Add bootphase tags to cpsw_mac_syscon and phy_gmii_sel AM62A: - phycore-som: Add bootphase tags to cpsw_mac_syscon and phy_gmii_sel AM62P: - Verdin: Fix SD regulator startup delay AM67A: - Kontron SA67: Fix CMA node and SD card regulator configuration AM69: - Aquila: Change main_spi0/2 chip select to GPIO mode - Aquila-clover: Change main_spi2 CS0 to GPIO mode - Aquila-dev/clover: Fix USB-C Sink PDO configuration * tag 'ti-k3-dt-for-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix SD card regulator arm64: dts: ti: k3-am67a-kontron-sa67-base: Fix CMA node arm64: dts: ti: k3-am62p-j722s-common-main: Add HSM M4F node arm64: dts: ti: k3-{j784s4-j742s2/j721s2}-mcu-wakeup: Add HSM M4F node arm64: dts: ti: k3-j784s4-j742s2-main-common.dtsi: Refactor watchdog instances for j784s4 arm64: dts: ti: k3-j784s4-main.dtsi: Move c71_3 node to appropriate order arm64: dts: ti: k3-am69-aquila-clover: Change main_spi2 CS0 to GPIO mode arm64: dts: ti: k3-am69-aquila: Change main_spi0/2 CS to GPIO mode arm64: dts: ti: Use lowercase hex arm64: dts: ti: Minor whitespace cleanup arm64: dts: ti: am62p-verdin: Fix SD regulator startup delay arm64: dts: ti: k3-am69-aquila-clover: Fix USB-C Sink PDO arm64: dts: ti: k3-am69-aquila-dev: Fix USB-C Sink PDO arm64: dts: ti: k3-am62(a)-phycore-som: Add bootphase tag to phy_gmii_sel arm64: dts: ti: k3-am62a-phycore-som: Add bootphase tag to cpsw_mac_syscon arm64: dts: ti: k3-am62-phycore-som: Add bootphase tag to cpsw_mac_syscon arm64: dts: ti: k3-am62-lp-sk-nand: Rename pinctrls to fix schema warnings arm64: dts: ti: k3-am642-phyboard-electra-x27-gpio1-spi1-uart3: Fix schema warnings arm64: dts: ti: k3-am642-phyboard-electra-peb-c-010: Fix icssg-prueth schema warning Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 25ed1e9 + 53289af commit 0a82d3d

35 files changed

Lines changed: 238 additions & 160 deletions

‎arch/arm64/boot/dts/ti/k3-am62-lp-sk-nand.dtso‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
};
1515

1616
&main_pmx0 {
17-
gpmc0_pins_default: gpmc0-pins-default {
17+
gpmc0_pins_default: gpmc0-default-pins {
1818
pinctrl-single,pins = <
1919
AM62X_IOPAD(0x003c, PIN_INPUT, 0) /* (K19) GPMC0_AD0 */
2020
AM62X_IOPAD(0x0040, PIN_INPUT, 0) /* (L19) GPMC0_AD1 */

‎arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,10 @@
220220
bootph-all;
221221
};
222222

223+
&cpsw_mac_syscon {
224+
bootph-all;
225+
};
226+
223227
&cpsw3g_mdio {
224228
pinctrl-names = "default";
225229
pinctrl-0 = <&main_mdio1_pins_default>;
@@ -359,6 +363,10 @@
359363
};
360364
};
361365

366+
&phy_gmii_sel {
367+
bootph-all;
368+
};
369+
362370
&sdhci0 {
363371
pinctrl-names = "default";
364372
pinctrl-0 = <&main_mmc0_pins_default>;

‎arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@
197197
bootph-all;
198198
};
199199

200+
&cpsw_mac_syscon {
201+
bootph-all;
202+
};
203+
200204
&cpsw3g_mdio {
201205
pinctrl-names = "default";
202206
pinctrl-0 = <&main_mdio1_pins_default>;
@@ -350,6 +354,10 @@
350354
};
351355
};
352356

357+
&phy_gmii_sel {
358+
bootph-all;
359+
};
360+
353361
&sdhci0 {
354362
pinctrl-names = "default";
355363
pinctrl-0 = <&main_mmc0_pins_default>;

‎arch/arm64/boot/dts/ti/k3-am62d2-evm.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@
669669
pinctrl-0 = <&ospi0_pins_default>;
670670
status = "okay";
671671

672-
flash@0{
672+
flash@0 {
673673
compatible = "jedec,spi-nor";
674674
reg = <0x0>;
675675
spi-tx-bus-width = <8>;

‎arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,4 +1117,21 @@
11171117
clocks = <&k3_clks 204 2>;
11181118
power-domains = <&k3_pds 204 TI_SCI_PD_EXCLUSIVE>;
11191119
};
1120+
1121+
hsm: remoteproc@43c00000 {
1122+
compatible = "ti,hsm-m4fss";
1123+
/* contiguous regions but instantiated separately in HW */
1124+
reg = <0x00 0x43c00000 0x00 0x20000>,
1125+
<0x00 0x43c20000 0x00 0x10000>,
1126+
<0x00 0x43c30000 0x00 0x10000>;
1127+
reg-names = "sram0_0", "sram0_1", "sram1";
1128+
resets = <&k3_reset 225 1>;
1129+
firmware-name = "am62p-hsm-m4f-fw";
1130+
bootph-pre-ram;
1131+
ti,sci = <&dmsc>;
1132+
ti,sci-dev-id = <225>;
1133+
ti,sci-proc-ids = <0x80 0xff>;
1134+
/* reserved for early-stage bootloader */
1135+
status = "reserved";
1136+
};
11201137
};

‎arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
regulator-max-microvolt = <3300000>;
113113
regulator-min-microvolt = <3300000>;
114114
regulator-name = "+V3.3_SD";
115-
startup-delay-us = <2000>;
115+
startup-delay-us = <20000>;
116116
};
117117

118118
reg_sd1_vqmmc: regulator-sdhci1-vqmmc {
@@ -514,7 +514,7 @@
514514
pinctrl-single,pins = <
515515
AM62PX_IOPAD(0x0120, PIN_INPUT, 0) /* (K24) MMC2_CMD */ /* SODIMM 160, WiFi_SDIO_CMD */
516516
AM62PX_IOPAD(0x0118, PIN_OUTPUT, 0) /* (K21) MMC2_CLK */ /* SODIMM 156, WiFi_SDIO_CLK */
517-
AM62PX_IOPAD(0x011C, PIN_INPUT, 0) /* () MMC2_CLKLB */
517+
AM62PX_IOPAD(0x011c, PIN_INPUT, 0) /* () MMC2_CLKLB */
518518
AM62PX_IOPAD(0x0114, PIN_INPUT, 0) /* (K23) MMC2_DAT0 */ /* SODIMM 162, WiFi_SDIO_DATA0 */
519519
AM62PX_IOPAD(0x0110, PIN_INPUT, 0) /* (K22) MMC2_DAT1 */ /* SODIMM 164, WiFi_SDIO_DATA1 */
520520
AM62PX_IOPAD(0x010c, PIN_INPUT, 0) /* (L20) MMC2_DAT2 */ /* SODIMM 166, WiFi_SDIO_DATA2 */

‎arch/arm64/boot/dts/ti/k3-am62p.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<0x00 0x31100000 0x00 0x31100000 0x00 0x00050000>, /* USB1 DWC3 Core window */
9797
<0x00 0x40900000 0x00 0x40900000 0x00 0x00030000>, /* SA3UL */
9898
<0x00 0x43600000 0x00 0x43600000 0x00 0x00010000>, /* SA3 sproxy data */
99+
<0x00 0x43c00000 0x00 0x43c00000 0x00 0x00040000>, /* HSM SRAM ranges */
99100
<0x00 0x44043000 0x00 0x44043000 0x00 0x00000fe0>, /* TI SCI DEBUG */
100101
<0x00 0x44860000 0x00 0x44860000 0x00 0x00040000>, /* SA3 sproxy config */
101102
<0x00 0x48000000 0x00 0x48000000 0x00 0x06408000>, /* DMSS */

‎arch/arm64/boot/dts/ti/k3-am62p5-sk.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
pinctrl-single,pins = <
284284
AM62PX_IOPAD(0x0120, PIN_INPUT, 0) /* (K24) MMC2_CMD */
285285
AM62PX_IOPAD(0x0118, PIN_OUTPUT, 0) /* (K21) MMC2_CLK */
286-
AM62PX_IOPAD(0x011C, PIN_INPUT, 0) /* () MMC2_CLKLB */
286+
AM62PX_IOPAD(0x011c, PIN_INPUT, 0) /* () MMC2_CLKLB */
287287
AM62PX_IOPAD(0x0114, PIN_INPUT, 0) /* (K23) MMC2_DAT0 */
288288
AM62PX_IOPAD(0x0110, PIN_INPUT_PULLUP, 0) /* (K22) MMC2_DAT1 */
289289
AM62PX_IOPAD(0x010c, PIN_INPUT_PULLUP, 0) /* (L20) MMC2_DAT2 */

‎arch/arm64/boot/dts/ti/k3-am62p5-var-som-symphony.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224
status = "okay";
225225
};
226226

227-
&main_i2c0{
227+
&main_i2c0 {
228228
pinctrl-names = "default";
229229
pinctrl-0 = <&pinctrl_i2c0>;
230230
clock-frequency = <400000>;
@@ -466,7 +466,7 @@
466466
pinctrl-0 = <&pinctrl_mmc1>;
467467
disable-wp;
468468
bootph-all;
469-
status="okay";
469+
status = "okay";
470470
};
471471

472472
&ti_csi2rx0 {

‎arch/arm64/boot/dts/ti/k3-am64-main.dtsi‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
#interrupt-cells = <3>;
8585
interrupt-controller;
8686
reg = <0x00 0x01800000 0x00 0x10000>, /* GICD */
87-
<0x00 0x01840000 0x00 0xC0000>, /* GICR */
87+
<0x00 0x01840000 0x00 0xc0000>, /* GICR */
8888
<0x01 0x00000000 0x00 0x2000>, /* GICC */
8989
<0x01 0x00010000 0x00 0x1000>, /* GICH */
9090
<0x01 0x00020000 0x00 0x2000>; /* GICV */
@@ -685,14 +685,14 @@
685685
power-domains = <&k3_pds 13 TI_SCI_PD_EXCLUSIVE>;
686686
status = "disabled";
687687

688-
dmas = <&main_pktdma 0xC500 15>,
689-
<&main_pktdma 0xC501 15>,
690-
<&main_pktdma 0xC502 15>,
691-
<&main_pktdma 0xC503 15>,
692-
<&main_pktdma 0xC504 15>,
693-
<&main_pktdma 0xC505 15>,
694-
<&main_pktdma 0xC506 15>,
695-
<&main_pktdma 0xC507 15>,
688+
dmas = <&main_pktdma 0xc500 15>,
689+
<&main_pktdma 0xc501 15>,
690+
<&main_pktdma 0xc502 15>,
691+
<&main_pktdma 0xc503 15>,
692+
<&main_pktdma 0xc504 15>,
693+
<&main_pktdma 0xc505 15>,
694+
<&main_pktdma 0xc506 15>,
695+
<&main_pktdma 0xc507 15>,
696696
<&main_pktdma 0x4500 15>;
697697
dma-names = "tx0", "tx1", "tx2", "tx3", "tx4", "tx5", "tx6",
698698
"tx7", "rx";

0 commit comments

Comments
 (0)