Unverified Commit 0a82d3d4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ti-k3-dt-for-v6.20' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 25ed1e98 53289af6

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ &mcasp1 { 
};



&main_pmx0 {

	gpmc0_pins_default: gpmc0-pins-default {

	gpmc0_pins_default: gpmc0-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x003c, PIN_INPUT, 0) /* (K19) GPMC0_AD0 */

			AM62X_IOPAD(0x0040, PIN_INPUT, 0) /* (L19) GPMC0_AD1 */

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

+8 −0
Original line number Diff line number Diff line
@@ -220,6 +220,10 @@ &cpsw_port1 { 
	bootph-all;

};



&cpsw_mac_syscon {

	bootph-all;

};



&cpsw3g_mdio {

	pinctrl-names = "default";

	pinctrl-0 = <&main_mdio1_pins_default>;
@@ -359,6 +363,10 @@ serial_flash: flash@0 { 
	};

};



&phy_gmii_sel {

	bootph-all;

};



&sdhci0 {

	pinctrl-names = "default";

	pinctrl-0 = <&main_mmc0_pins_default>;

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

+8 −0
Original line number Diff line number Diff line
@@ -197,6 +197,10 @@ &cpsw_port1 { 
	bootph-all;

};



&cpsw_mac_syscon {

	bootph-all;

};



&cpsw3g_mdio {

	pinctrl-names = "default";

	pinctrl-0 = <&main_mdio1_pins_default>;
@@ -350,6 +354,10 @@ serial_flash: flash@0 { 
	};

};



&phy_gmii_sel {

	bootph-all;

};



&sdhci0 {

	pinctrl-names = "default";

	pinctrl-0 = <&main_mmc0_pins_default>;

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

+17 −0
Original line number Diff line number Diff line
@@ -1117,4 +1117,21 @@ vpu: video-codec@30210000 { 
		clocks = <&k3_clks 204 2>;

		power-domains = <&k3_pds 204 TI_SCI_PD_EXCLUSIVE>;

	};



	hsm: remoteproc@43c00000 {

		compatible = "ti,hsm-m4fss";

		/* contiguous regions but instantiated separately in HW */

		reg = <0x00 0x43c00000 0x00 0x20000>,

		      <0x00 0x43c20000 0x00 0x10000>,

		      <0x00 0x43c30000 0x00 0x10000>;

		reg-names = "sram0_0", "sram0_1", "sram1";

		resets = <&k3_reset 225 1>;

		firmware-name = "am62p-hsm-m4f-fw";

		bootph-pre-ram;

		ti,sci = <&dmsc>;

		ti,sci-dev-id = <225>;

		ti,sci-proc-ids = <0x80 0xff>;

		/* reserved for early-stage bootloader */

		status = "reserved";

	};

};

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

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ reg_sd1_vmmc: regulator-sdhci1-vmmc { 
		regulator-max-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-name = "+V3.3_SD";

		startup-delay-us = <2000>;

		startup-delay-us = <20000>;

	};



	reg_sd1_vqmmc: regulator-sdhci1-vqmmc {
@@ -514,7 +514,7 @@ pinctrl_sdhci2: main-mmc2-default-pins { 
		pinctrl-single,pins = <

			AM62PX_IOPAD(0x0120, PIN_INPUT,  0) /* (K24) MMC2_CMD  */ /* SODIMM 160, WiFi_SDIO_CMD   */

			AM62PX_IOPAD(0x0118, PIN_OUTPUT, 0) /* (K21) MMC2_CLK  */ /* SODIMM 156, WiFi_SDIO_CLK   */

			AM62PX_IOPAD(0x011C, PIN_INPUT,  0) /* () MMC2_CLKLB   */

			AM62PX_IOPAD(0x011c, PIN_INPUT,  0) /* () MMC2_CLKLB   */

			AM62PX_IOPAD(0x0114, PIN_INPUT,  0) /* (K23) MMC2_DAT0 */ /* SODIMM 162, WiFi_SDIO_DATA0 */

			AM62PX_IOPAD(0x0110, PIN_INPUT,  0) /* (K22) MMC2_DAT1 */ /* SODIMM 164, WiFi_SDIO_DATA1 */

			AM62PX_IOPAD(0x010c, PIN_INPUT,  0) /* (L20) MMC2_DAT2 */ /* SODIMM 166, WiFi_SDIO_DATA2 */