Unverified Commit 27079776 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'ti-k3-dt-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt

TI K3 device tree updates for v6.7

New features across K3 SoCs:
- Watchdog and ESM nodes for J7xx
- DMA node for Camera interface (CSI) for J7xx
- C7x DSP and R5F rproc support for J7xx/AM68/AM69

AM68:
- USB and PCIe support

AM64:
- IO expander support
- GPIO LED, I2C device supplies for am64-tqma64xxl-mbax4xxl
- RTC IRQ pin update for am64 phycore

AM62A:
- TPS6593 PMIC and mcasp audio support

Misc:
- bootph-* tag addition for AM64 and AM62
- iw416 based bluetooth support on verdin-am62
- IO Expander addition for AM64 and AM65 boards

Fixes:
- Convert DMSS/NAVSS to simple-bus compatible to squelch dtbs_check
  warnings
- Minor indentation fixes
- Specify base dtb for k3-j721s2-evm-gesi.dtbo and k3-am62x-sk-hdmi-audio.dtbo
- Misc fixups for AM62 Beagleplay, verdin-am62 boards

* tag 'ti-k3-dt-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (48 commits)
  arm64: dts: ti: k3-j712s2-mcu: Add the mcu domain watchdog instances
  arm64: dts: ti: k3-j721s2-main: Add the main domain watchdog instances
  arm64: dts: ti: k3-j784s4-mcu: Add the mcu domain watchdog instances
  arm64: dts: ti: k3-j784s4-main: Add the main domain watchdog instances
  arm64: dts: ti: k3-j7200: Add MCU domain ESM instance
  arm64: dts: ti: k3-j784s4: Add ESM instances
  arm64: dts: ti: k3-j721s2: Add ESM instances
  arm64: dts: ti: k3-j784s4-main: Add BCDMA instance for CSI2RX
  arm64: dts: ti: k3-j721s2-main: Add BCDMA instance for CSI2RX
  arm64: dts: ti: k3-*: Convert NAVSS to simple-bus
  arm64: dts: ti: k3-*: Convert DMSS to simple-bus
  arm64: dts: ti: Fix HDMI Audio overlay in Makefile
  arm64: dts: ti: k3-am62a7-sk: Enable audio on AM62A
  arm64: dts: ti: k3-am62a7-sk: Add support for TPS6593 PMIC
  arm64: dts: ti: k3-am62a7-sk: Drop i2c-1 to 100Khz
  arm64: dts: ti: k3-am62a7-sk: Split vcc_3v3 regulators
  arm64: dts: ti: k3-am62a-main: Add nodes for McASP
  arm64: dts: ti: k3-am64-tqma64xxl-mbax4xxl: update gpio-led configuration
  arm64: dts: ti: k3-am64-tqma64xxl-mbax4xxl: add chassis-type
  arm64: dts: ti: k3-am64-tqma64xxl-mbax4xxl: add muxing for GPIOs on pin headers
  ...

Link: https://lore.kernel.org/r/f05c98b6-6274-4544-8fcd-0332c39244c9@ti.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 79d01625 56bc3115

arch/arm64/boot/dts/ti/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
# alphabetically.



# Boards with AM62x SoC

k3-am625-sk-hdmi-audio-dtbs := k3-am625-sk.dtb k3-am62x-sk-hdmi-audio.dtbo

k3-am62-lp-sk-hdmi-audio-dtbs := k3-am62-lp-sk.dtb k3-am62x-sk-hdmi-audio.dtbo

dtb-$(CONFIG_ARCH_K3) += k3-am625-beagleplay.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am625-phyboard-lyra-rdk.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am625-sk.dtb
@@ -19,7 +21,8 @@ dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dahlia.dtb 
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dev.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-yavia.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-hdmi-audio.dtbo

dtb-$(CONFIG_ARCH_K3) += k3-am625-sk-hdmi-audio.dtb

dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk-hdmi-audio.dtb



# Boards with AM62Ax SoC

dtb-$(CONFIG_ARCH_K3) += k3-am62a7-sk.dtb
@@ -66,6 +69,8 @@ dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb 
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb

dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb

dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-gesi-exp-board.dtbo

k3-j721s2-evm-dtbs := k3-j721s2-common-proc-board.dtb k3-j721s2-evm-gesi-exp-board.dtbo

dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm.dtb



# Boards with J784s4 SoC

dtb-$(CONFIG_ARCH_K3) += k3-am69-sk.dtb

arch/arm64/boot/dts/ti/k3-am62-main.dtsi

+11 −1
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ audio_refclk1: clock-controller@82e4 { 
	};



	dmss: bus@48000000 {

		compatible = "simple-mfd";

		bootph-all;

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

		dma-ranges;
@@ -90,6 +91,7 @@ dmss: bus@48000000 { 
		ti,sci-dev-id = <25>;



		secure_proxy_main: mailbox@4d000000 {

			bootph-all;

			compatible = "ti,am654-secure-proxy";

			#mbox-cells = <1>;

			reg-names = "target_data", "rt", "scfg";
@@ -165,6 +167,7 @@ main_pktdma: dma-controller@485c0000 { 
	};



	dmsc: system-controller@44043000 {

		bootph-all;

		compatible = "ti,k2g-sci";

		ti,host-id = <12>;

		mbox-names = "rx", "tx";
@@ -174,16 +177,19 @@ dmsc: system-controller@44043000 { 
		reg = <0x00 0x44043000 0x00 0xfe0>;



		k3_pds: power-controller {

			bootph-all;

			compatible = "ti,sci-pm-domain";

			#power-domain-cells = <2>;

		};



		k3_clks: clock-controller {

			bootph-all;

			compatible = "ti,k2g-sci-clk";

			#clock-cells = <2>;

		};



		k3_reset: reset-controller {

			bootph-all;

			compatible = "ti,sci-reset";

			#reset-cells = <2>;

		};
@@ -202,6 +208,7 @@ crypto: crypto@40900000 { 
	};



	secure_proxy_sa3: mailbox@43600000 {

		bootph-pre-ram;

		compatible = "ti,am654-secure-proxy";

		#mbox-cells = <1>;

		reg-names = "target_data", "rt", "scfg";
@@ -217,6 +224,7 @@ secure_proxy_sa3: mailbox@43600000 { 
	};



	main_pmx0: pinctrl@f4000 {

		bootph-all;

		compatible = "pinctrl-single";

		reg = <0x00 0xf4000 0x00 0x2ac>;

		#pinctrl-cells = <1>;
@@ -225,12 +233,14 @@ main_pmx0: pinctrl@f4000 { 
	};



	main_esm: esm@420000 {

		bootph-pre-ram;

		compatible = "ti,j721e-esm";

		reg = <0x00 0x420000 0x00 0x1000>;

		ti,esm-pins = <160>, <161>, <162>, <163>, <177>, <178>;

	};



	main_timer0: timer@2400000 {

		bootph-all;

		compatible = "ti,am654-timer";

		reg = <0x00 0x2400000 0x00 0x400>;

		interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


&cbass_mcu {

	mcu_pmx0: pinctrl@4084000 {

		bootph-all;

		compatible = "pinctrl-single";

		reg = <0x00 0x04084000 0x00 0x88>;

		#pinctrl-cells = <1>;
@@ -15,6 +16,7 @@ mcu_pmx0: pinctrl@4084000 { 
	};



	mcu_esm: esm@4100000 {

		bootph-pre-ram;

		compatible = "ti,j721e-esm";

		reg = <0x00 0x4100000 0x00 0x1000>;

		ti,esm-pins = <0>, <1>, <2>, <85>;

arch/arm64/boot/dts/ti/k3-am62-verdin-wifi.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -35,5 +35,11 @@ &sdhci2 { 
&main_uart5 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart5>;

	uart-has-rtscts;

	status = "okay";



	bluetooth {

		compatible = "nxp,88w8987-bt";

		fw-init-baudrate = <3000000>;

	};

};

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

+1 −0
Original line number Diff line number Diff line
@@ -1061,6 +1061,7 @@ dsi_bridge: dsi@e { 
		vddc-supply = <&reg_1v2_dsi>;

		vddmipi-supply = <&reg_1v2_dsi>;

		vddio-supply = <&reg_1v8_dsi>;

		status = "disabled";



		dsi_bridge_ports: ports {

			#address-cells = <1>;