Skip to content

Commit a3b8016

Browse files
committed
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>
2 parents ececfba + cf5e8ad commit a3b8016

3 files changed

Lines changed: 7 additions & 10 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
};
1515

1616
&main_pmx0 {
17-
gpmc0_pins_default: gpmc0-pins-default {
17+
gpmc0_pins_default: gpmc0-default-pins {
1818
pinctrl-single,pins = <
1919
AM62X_IOPAD(0x003c, PIN_INPUT, 0) /* (K19) GPMC0_AD0 */
2020
AM62X_IOPAD(0x0040, PIN_INPUT, 0) /* (L19) GPMC0_AD1 */

arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-peb-c-010.dtso

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,10 @@
3030
<&main_pktdma 0xc206 15>, /* egress slice 1 */
3131
<&main_pktdma 0xc207 15>, /* egress slice 1 */
3232
<&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 */
33+
<&main_pktdma 0x4201 15>; /* ingress slice 1 */
3634
dma-names = "tx0-0", "tx0-1", "tx0-2", "tx0-3",
3735
"tx1-0", "tx1-1", "tx1-2", "tx1-3",
38-
"rx0", "rx1",
39-
"rxmgm0", "rxmgm1";
36+
"rx0", "rx1";
4037

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
};
2121

2222
&main_pmx0 {
23-
main_gpio1_exp_header_gpio_pins_default: main-gpio1-exp-header-gpio-pins-default {
23+
main_gpio1_exp_header_gpio_pins_default: main-gpio1-exp-header-gpio-default-pins {
2424
pinctrl-single,pins = <
2525
AM64X_IOPAD(0x0220, PIN_INPUT, 7) /* (D14) SPI1_CS1.GPIO1_48 */
2626
>;
2727
};
2828

29-
main_spi1_pins_default: main-spi1-pins-default {
29+
main_spi1_pins_default: main-spi1-default-pins {
3030
pinctrl-single,pins = <
3131
AM64X_IOPAD(0x0224, PIN_INPUT, 0) /* (C14) SPI1_CLK */
3232
AM64X_IOPAD(0x021C, PIN_OUTPUT, 0) /* (B14) SPI1_CS0 */
@@ -35,7 +35,7 @@
3535
>;
3636
};
3737

38-
main_uart3_pins_default: main-uart3-pins-default {
38+
main_uart3_pins_default: main-uart3-default-pins {
3939
pinctrl-single,pins = <
4040
AM64X_IOPAD(0x0048, PIN_INPUT, 2) /* (U20) GPMC0_AD3.UART3_RXD */
4141
AM64X_IOPAD(0x004c, PIN_OUTPUT, 2) /* (U18) GPMC0_AD4.UART3_TXD */
@@ -52,7 +52,7 @@
5252
&main_spi1 {
5353
pinctrl-names = "default";
5454
pinctrl-0 = <&main_spi1_pins_default>;
55-
ti,pindir-d0-out-d1-in = <1>;
55+
ti,pindir-d0-out-d1-in;
5656
status = "okay";
5757
};
5858

0 commit comments

Comments
 (0)