Commit a3b80161 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'ti-k3-dt-fixes-for-v6.19' of... 

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

TI K3 DT fixes for v6.19

- minor fixes for overlay files

* tag 'ti-k3-dt-fixes-for-v6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux

:
  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 avatarKrzysztof Kozlowski <krzk@kernel.org>
parents ececfba2 cf5e8ade

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-am642-phyboard-electra-peb-c-010.dtso

+2 −5
Original line number Diff line number Diff line
@@ -30,13 +30,10 @@ icssg1-ethernet { 
				<&main_pktdma 0xc206 15>, /* egress slice 1 */

				<&main_pktdma 0xc207 15>, /* egress slice 1 */

				<&main_pktdma 0x4200 15>, /* ingress slice 0 */

				<&main_pktdma 0x4201 15>, /* ingress slice 1 */

				<&main_pktdma 0x4202 0>, /* mgmnt rsp slice 0 */

				<&main_pktdma 0x4203 0>; /* mgmnt rsp slice 1 */

				<&main_pktdma 0x4201 15>; /* ingress slice 1 */

		dma-names = "tx0-0", "tx0-1", "tx0-2", "tx0-3",

					"tx1-0", "tx1-1", "tx1-2", "tx1-3",

					"rx0", "rx1",

					"rxmgm0", "rxmgm1";

					"rx0", "rx1";



		firmware-name = "ti-pruss/am65x-sr2-pru0-prueth-fw.elf",

				"ti-pruss/am65x-sr2-rtu0-prueth-fw.elf",

arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-x27-gpio1-spi1-uart3.dtso

+4 −4
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ aliases { 
};



&main_pmx0 {

	main_gpio1_exp_header_gpio_pins_default: main-gpio1-exp-header-gpio-pins-default {

	main_gpio1_exp_header_gpio_pins_default: main-gpio1-exp-header-gpio-default-pins {

		pinctrl-single,pins = <

			AM64X_IOPAD(0x0220, PIN_INPUT, 7)	/* (D14) SPI1_CS1.GPIO1_48 */

		>;

	};



	main_spi1_pins_default: main-spi1-pins-default {

	main_spi1_pins_default: main-spi1-default-pins {

		pinctrl-single,pins = <

			AM64X_IOPAD(0x0224, PIN_INPUT, 0)	/* (C14) SPI1_CLK */

			AM64X_IOPAD(0x021C, PIN_OUTPUT, 0)	/* (B14) SPI1_CS0 */
@@ -35,7 +35,7 @@ AM64X_IOPAD(0x022C, PIN_INPUT, 0) /* (A15) SPI1_D1 */ 
		>;

	};



	main_uart3_pins_default: main-uart3-pins-default {

	main_uart3_pins_default: main-uart3-default-pins {

		pinctrl-single,pins = <

			AM64X_IOPAD(0x0048, PIN_INPUT, 2)       /* (U20) GPMC0_AD3.UART3_RXD */

			AM64X_IOPAD(0x004c, PIN_OUTPUT, 2)      /* (U18) GPMC0_AD4.UART3_TXD */
@@ -52,7 +52,7 @@ &main_gpio1 { 
&main_spi1 {

	pinctrl-names = "default";

	pinctrl-0 = <&main_spi1_pins_default>;

	ti,pindir-d0-out-d1-in = <1>;

	ti,pindir-d0-out-d1-in;

	status = "okay";

};