Unverified Commit 7310e458 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'ti-k3-dt-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into arm/dt

TI K3 device tree updates for v5.20

* AM62: fixups, sa2ul enabled, ramoops for sk
* others: whitespace and gpio-key cleanup.

* tag 'ti-k3-dt-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  arm64: dts: ti: k3-am62-main: Enable crypto accelerator
  arm64: dts: ti: k3-am625-sk: Enable ramoops
  arm64: dts: ti: k3-am642-sk: Add pinmux corresponding to main_uart0
  arm64: dts: ti: Align gpio-key node names with dtschema
  arm64: dts: ti: Adjust whitespace around '='

Link: https://lore.kernel.org/r/20220708232701.vpk45lwogpasaaay@enchilada


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c784744b 8af89365

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

+15 −2
Original line number Diff line number Diff line
@@ -165,6 +165,19 @@ k3_reset: reset-controller { 
		};

	};



	crypto: crypto@40900000 {

		compatible = "ti,am62-sa3ul";

		reg = <0x00 0x40900000 0x00 0x1200>;

		power-domains = <&k3_pds 70 TI_SCI_PD_SHARED>;

		#address-cells = <2>;

		#size-cells = <2>;

		ranges = <0x00 0x40900000 0x00 0x40900000 0x00 0x30000>;



		dmas = <&main_pktdma 0xf501 0>, <&main_pktdma 0x7506 0>,

		       <&main_pktdma 0x7507 0>;

		dma-names = "tx", "rx1", "rx2";

	};



	main_pmx0: pinctrl@f4000 {

		compatible = "pinctrl-single";

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

arch/arm64/boot/dts/ti/k3-am625-sk.dts

+10 −1
Original line number Diff line number Diff line
@@ -43,6 +43,15 @@ reserved-memory { 
		#size-cells = <2>;

		ranges;



		ramoops@9ca00000 {

			compatible = "ramoops";

			reg = <0x00 0x9ca00000 0x00 0x00100000>;

			record-size = <0x8000>;

			console-size = <0x8000>;

			ftrace-size = <0x00>;

			pmsg-size = <0x8000>;

		};



		secure_tfa_ddr: tfa@9e780000 {

			reg = <0x00 0x9e780000 0x00 0x80000>;

			alignment = <0x1000>;

arch/arm64/boot/dts/ti/k3-am642-sk.dts

+15 −1
Original line number Diff line number Diff line
@@ -166,6 +166,15 @@ AM64X_IOPAD(0x0298, PIN_INPUT, 0) /* (D19) MMC1_SDCD */ 
		>;

	};



	main_uart0_pins_default: main-uart0-pins-default {

		pinctrl-single,pins = <

			AM64X_IOPAD(0x0238, PIN_INPUT, 0) /* (B16) UART0_CTSn */

			AM64X_IOPAD(0x023c, PIN_OUTPUT, 0) /* (A16) UART0_RTSn */

			AM64X_IOPAD(0x0230, PIN_INPUT, 0) /* (D15) UART0_RXD */

			AM64X_IOPAD(0x0234, PIN_OUTPUT, 0) /* (C16) UART0_TXD */

		>;

	};



	main_usb0_pins_default: main-usb0-pins-default {

		pinctrl-single,pins = <

			AM64X_IOPAD(0x02a8, PIN_OUTPUT, 0) /* (E19) USB0_DRVVBUS */
@@ -268,6 +277,11 @@ &mcu_uart1 { 
	status = "disabled";

};



&main_uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&main_uart0_pins_default>;

};



&main_uart1 {

	/* main_uart1 is reserved for firmware usage */

	status = "reserved";

arch/arm64/boot/dts/ti/k3-am654-base-board.dts

+4 −4
Original line number Diff line number Diff line
@@ -73,13 +73,13 @@ gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&push_button_pins_default>;



		sw5 {

		switch-5 {

			label = "GPIO Key USER1";

			linux,code = <BTN_0>;

			gpios = <&wkup_gpio0 24 GPIO_ACTIVE_LOW>;

		};



		sw6 {

		switch-6 {

			label = "GPIO Key USER2";

			linux,code = <BTN_1>;

			gpios = <&wkup_gpio0 27 GPIO_ACTIVE_LOW>;

arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts

+2 −2
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ gpio_keys: gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&sw10_button_pins_default &sw11_button_pins_default>;



		sw10: sw10 {

		sw10: switch-10 {

			label = "GPIO Key USER1";

			linux,code = <BTN_0>;

			gpios = <&main_gpio0 0 GPIO_ACTIVE_LOW>;

		};



		sw11: sw11 {

		sw11: switch-11 {

			label = "GPIO Key USER2";

			linux,code = <BTN_1>;

			gpios = <&wkup_gpio0 7 GPIO_ACTIVE_LOW>;

arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi

+2 −2

File changed.

Contains only whitespace changes.

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

+2 −2

File changed.

Contains only whitespace changes.

arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi

+2 −2

File changed.

Contains only whitespace changes.

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

+2 −2

File changed.

Contains only whitespace changes.

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

+7 −7

File changed.

Contains only whitespace changes.

arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi

+2 −2

File changed.

Contains only whitespace changes.

arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi

+2 −2

File changed.

Contains only whitespace changes.

arch/arm64/boot/dts/ti/k3-am642-evm.dts

+1 −1

File changed.

Contains only whitespace changes.

arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi

+2 −2

File changed.

Contains only whitespace changes.