tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Krzysztof Kozlowski <krzk@kernel.org>

Krzysztof Kozlowski a3b80161 ececfba2

+7 -10
unified split
+1 -1
arch/arm64/boot/dts/ti/k3-am62-lp-sk-nand.dtso
··· 14 }; 15 16 &main_pmx0 { 17 - gpmc0_pins_default: gpmc0-pins-default { 18 pinctrl-single,pins = < 19 AM62X_IOPAD(0x003c, PIN_INPUT, 0) /* (K19) GPMC0_AD0 */ 20 AM62X_IOPAD(0x0040, PIN_INPUT, 0) /* (L19) GPMC0_AD1 */
··· 14 }; 15 16 &main_pmx0 { 17 + gpmc0_pins_default: gpmc0-default-pins { 18 pinctrl-single,pins = < 19 AM62X_IOPAD(0x003c, PIN_INPUT, 0) /* (K19) GPMC0_AD0 */ 20 AM62X_IOPAD(0x0040, PIN_INPUT, 0) /* (L19) GPMC0_AD1 */
+2 -5
arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-peb-c-010.dtso
··· 30 <&main_pktdma 0xc206 15>, /* egress slice 1 */ 31 <&main_pktdma 0xc207 15>, /* egress slice 1 */ 32 <&main_pktdma 0x4200 15>, /* ingress slice 0 */ 33 - <&main_pktdma 0x4201 15>, /* ingress slice 1 */ 34 - <&main_pktdma 0x4202 0>, /* mgmnt rsp slice 0 */ 35 - <&main_pktdma 0x4203 0>; /* mgmnt rsp slice 1 */ 36 dma-names = "tx0-0", "tx0-1", "tx0-2", "tx0-3", 37 "tx1-0", "tx1-1", "tx1-2", "tx1-3", 38 - "rx0", "rx1", 39 - "rxmgm0", "rxmgm1"; 40 41 firmware-name = "ti-pruss/am65x-sr2-pru0-prueth-fw.elf", 42 "ti-pruss/am65x-sr2-rtu0-prueth-fw.elf",
··· 30 <&main_pktdma 0xc206 15>, /* egress slice 1 */ 31 <&main_pktdma 0xc207 15>, /* egress slice 1 */ 32 <&main_pktdma 0x4200 15>, /* ingress slice 0 */ 33 + <&main_pktdma 0x4201 15>; /* ingress slice 1 */ 34 dma-names = "tx0-0", "tx0-1", "tx0-2", "tx0-3", 35 "tx1-0", "tx1-1", "tx1-2", "tx1-3", 36 + "rx0", "rx1"; 37 38 firmware-name = "ti-pruss/am65x-sr2-pru0-prueth-fw.elf", 39 "ti-pruss/am65x-sr2-rtu0-prueth-fw.elf",
+4 -4
arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-x27-gpio1-spi1-uart3.dtso
··· 20 }; 21 22 &main_pmx0 { 23 - main_gpio1_exp_header_gpio_pins_default: main-gpio1-exp-header-gpio-pins-default { 24 pinctrl-single,pins = < 25 AM64X_IOPAD(0x0220, PIN_INPUT, 7) /* (D14) SPI1_CS1.GPIO1_48 */ 26 >; 27 }; 28 29 - main_spi1_pins_default: main-spi1-pins-default { 30 pinctrl-single,pins = < 31 AM64X_IOPAD(0x0224, PIN_INPUT, 0) /* (C14) SPI1_CLK */ 32 AM64X_IOPAD(0x021C, PIN_OUTPUT, 0) /* (B14) SPI1_CS0 */ ··· 35 >; 36 }; 37 38 - main_uart3_pins_default: main-uart3-pins-default { 39 pinctrl-single,pins = < 40 AM64X_IOPAD(0x0048, PIN_INPUT, 2) /* (U20) GPMC0_AD3.UART3_RXD */ 41 AM64X_IOPAD(0x004c, PIN_OUTPUT, 2) /* (U18) GPMC0_AD4.UART3_TXD */ ··· 52 &main_spi1 { 53 pinctrl-names = "default"; 54 pinctrl-0 = <&main_spi1_pins_default>; 55 - ti,pindir-d0-out-d1-in = <1>; 56 status = "okay"; 57 }; 58
··· 20 }; 21 22 &main_pmx0 { 23 + main_gpio1_exp_header_gpio_pins_default: main-gpio1-exp-header-gpio-default-pins { 24 pinctrl-single,pins = < 25 AM64X_IOPAD(0x0220, PIN_INPUT, 7) /* (D14) SPI1_CS1.GPIO1_48 */ 26 >; 27 }; 28 29 + main_spi1_pins_default: main-spi1-default-pins { 30 pinctrl-single,pins = < 31 AM64X_IOPAD(0x0224, PIN_INPUT, 0) /* (C14) SPI1_CLK */ 32 AM64X_IOPAD(0x021C, PIN_OUTPUT, 0) /* (B14) SPI1_CS0 */ ··· 35 >; 36 }; 37 38 + main_uart3_pins_default: main-uart3-default-pins { 39 pinctrl-single,pins = < 40 AM64X_IOPAD(0x0048, PIN_INPUT, 2) /* (U20) GPMC0_AD3.UART3_RXD */ 41 AM64X_IOPAD(0x004c, PIN_OUTPUT, 2) /* (U18) GPMC0_AD4.UART3_TXD */ ··· 52 &main_spi1 { 53 pinctrl-names = "default"; 54 pinctrl-0 = <&main_spi1_pins_default>; 55 + ti,pindir-d0-out-d1-in; 56 status = "okay"; 57 }; 58