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-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: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 7310e458 c784744b

+68 -32
+15 -2
arch/arm64/boot/dts/ti/k3-am62-main.dtsi
··· 144 144 compatible = "ti,k2g-sci"; 145 145 ti,host-id = <12>; 146 146 mbox-names = "rx", "tx"; 147 - mboxes= <&secure_proxy_main 12>, 148 - <&secure_proxy_main 13>; 147 + mboxes = <&secure_proxy_main 12>, 148 + <&secure_proxy_main 13>; 149 149 reg-names = "debug_messages"; 150 150 reg = <0x00 0x44043000 0x00 0xfe0>; 151 151 ··· 163 163 compatible = "ti,sci-reset"; 164 164 #reset-cells = <2>; 165 165 }; 166 + }; 167 + 168 + crypto: crypto@40900000 { 169 + compatible = "ti,am62-sa3ul"; 170 + reg = <0x00 0x40900000 0x00 0x1200>; 171 + power-domains = <&k3_pds 70 TI_SCI_PD_SHARED>; 172 + #address-cells = <2>; 173 + #size-cells = <2>; 174 + ranges = <0x00 0x40900000 0x00 0x40900000 0x00 0x30000>; 175 + 176 + dmas = <&main_pktdma 0xf501 0>, <&main_pktdma 0x7506 0>, 177 + <&main_pktdma 0x7507 0>; 178 + dma-names = "tx", "rx1", "rx2"; 166 179 }; 167 180 168 181 main_pmx0: pinctrl@f4000 {
+10 -1
arch/arm64/boot/dts/ti/k3-am625-sk.dts
··· 13 13 #include "k3-am625.dtsi" 14 14 15 15 / { 16 - compatible = "ti,am625-sk", "ti,am625"; 16 + compatible = "ti,am625-sk", "ti,am625"; 17 17 model = "Texas Instruments AM625 SK"; 18 18 19 19 aliases { ··· 42 42 #address-cells = <2>; 43 43 #size-cells = <2>; 44 44 ranges; 45 + 46 + ramoops@9ca00000 { 47 + compatible = "ramoops"; 48 + reg = <0x00 0x9ca00000 0x00 0x00100000>; 49 + record-size = <0x8000>; 50 + console-size = <0x8000>; 51 + ftrace-size = <0x00>; 52 + pmsg-size = <0x8000>; 53 + }; 45 54 46 55 secure_tfa_ddr: tfa@9e780000 { 47 56 reg = <0x00 0x9e780000 0x00 0x80000>;
+2 -2
arch/arm64/boot/dts/ti/k3-am64-main.dtsi
··· 174 174 compatible = "ti,k2g-sci"; 175 175 ti,host-id = <12>; 176 176 mbox-names = "rx", "tx"; 177 - mboxes= <&secure_proxy_main 12>, 177 + mboxes = <&secure_proxy_main 12>, 178 178 <&secure_proxy_main 13>; 179 179 reg-names = "debug_messages"; 180 180 reg = <0x00 0x44043000 0x00 0xfe0>; ··· 1301 1301 <0x00 0x20718000 0x00 0x8000>; 1302 1302 reg-names = "m_can", "message_ram"; 1303 1303 power-domains = <&k3_pds 99 TI_SCI_PD_EXCLUSIVE>; 1304 - clocks = <&k3_clks 99 5>, <&k3_clks 99 0>; 1304 + clocks = <&k3_clks 99 5>, <&k3_clks 99 0>; 1305 1305 clock-names = "hclk", "cclk"; 1306 1306 interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>, 1307 1307 <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
+1 -1
arch/arm64/boot/dts/ti/k3-am642-evm.dts
··· 13 13 #include "k3-am642.dtsi" 14 14 15 15 / { 16 - compatible = "ti,am642-evm", "ti,am642"; 16 + compatible = "ti,am642-evm", "ti,am642"; 17 17 model = "Texas Instruments AM642 EVM"; 18 18 19 19 chosen {
+15 -1
arch/arm64/boot/dts/ti/k3-am642-sk.dts
··· 12 12 #include "k3-am642.dtsi" 13 13 14 14 / { 15 - compatible = "ti,am642-sk", "ti,am642"; 15 + compatible = "ti,am642-sk", "ti,am642"; 16 16 model = "Texas Instruments AM642 SK"; 17 17 18 18 chosen { ··· 166 166 >; 167 167 }; 168 168 169 + main_uart0_pins_default: main-uart0-pins-default { 170 + pinctrl-single,pins = < 171 + AM64X_IOPAD(0x0238, PIN_INPUT, 0) /* (B16) UART0_CTSn */ 172 + AM64X_IOPAD(0x023c, PIN_OUTPUT, 0) /* (A16) UART0_RTSn */ 173 + AM64X_IOPAD(0x0230, PIN_INPUT, 0) /* (D15) UART0_RXD */ 174 + AM64X_IOPAD(0x0234, PIN_OUTPUT, 0) /* (C16) UART0_TXD */ 175 + >; 176 + }; 177 + 169 178 main_usb0_pins_default: main-usb0-pins-default { 170 179 pinctrl-single,pins = < 171 180 AM64X_IOPAD(0x02a8, PIN_OUTPUT, 0) /* (E19) USB0_DRVVBUS */ ··· 275 266 276 267 &mcu_uart1 { 277 268 status = "disabled"; 269 + }; 270 + 271 + &main_uart0 { 272 + pinctrl-names = "default"; 273 + pinctrl-0 = <&main_uart0_pins_default>; 278 274 }; 279 275 280 276 &main_uart1 {
+2 -2
arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
··· 425 425 426 426 psu: regulator@60 { 427 427 compatible = "ti,tps62363"; 428 - reg = <0x60>; 428 + reg = <0x60>; 429 429 regulator-name = "tps62363-vout"; 430 430 regulator-min-microvolt = <500000>; 431 431 regulator-max-microvolt = <1500000>; ··· 574 574 pinctrl-0 = <&mcu_spi0_pins_default>; 575 575 576 576 #address-cells = <1>; 577 - #size-cells= <0>; 577 + #size-cells = <0>; 578 578 ti,pindir-d0-out-d1-in; 579 579 }; 580 580
+7 -7
arch/arm64/boot/dts/ti/k3-am65-main.dtsi
··· 690 690 691 691 pcie0_rc: pcie@5500000 { 692 692 compatible = "ti,am654-pcie-rc"; 693 - reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x2000>, <0x0 0x5506000 0x0 0x1000>; 693 + reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x2000>, <0x0 0x5506000 0x0 0x1000>; 694 694 reg-names = "app", "dbics", "config", "atu"; 695 695 power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>; 696 696 #address-cells = <3>; ··· 710 710 711 711 pcie0_ep: pcie-ep@5500000 { 712 712 compatible = "ti,am654-pcie-ep"; 713 - reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x8000000>, <0x0 0x5506000 0x0 0x1000>; 713 + reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x8000000>, <0x0 0x5506000 0x0 0x1000>; 714 714 reg-names = "app", "dbics", "addr_space", "atu"; 715 715 power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>; 716 716 ti,syscon-pcie-mode = <&pcie0_mode>; ··· 723 723 724 724 pcie1_rc: pcie@5600000 { 725 725 compatible = "ti,am654-pcie-rc"; 726 - reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x2000>, <0x0 0x5606000 0x0 0x1000>; 726 + reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x2000>, <0x0 0x5606000 0x0 0x1000>; 727 727 reg-names = "app", "dbics", "config", "atu"; 728 728 power-domains = <&k3_pds 121 TI_SCI_PD_EXCLUSIVE>; 729 729 #address-cells = <3>; ··· 743 743 744 744 pcie1_ep: pcie-ep@5600000 { 745 745 compatible = "ti,am654-pcie-ep"; 746 - reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x4000000>, <0x0 0x5606000 0x0 0x1000>; 746 + reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x4000000>, <0x0 0x5606000 0x0 0x1000>; 747 747 reg-names = "app", "dbics", "addr_space", "atu"; 748 748 power-domains = <&k3_pds 121 TI_SCI_PD_EXCLUSIVE>; 749 749 ti,syscon-pcie-mode = <&pcie1_mode>; ··· 843 843 844 844 power-domains = <&k3_pds 67 TI_SCI_PD_EXCLUSIVE>; 845 845 846 - clocks = <&k3_clks 67 1>, 847 - <&k3_clks 216 1>, 848 - <&k3_clks 67 2>; 846 + clocks = <&k3_clks 67 1>, 847 + <&k3_clks 216 1>, 848 + <&k3_clks 67 2>; 849 849 clock-names = "fck", "vp1", "vp2"; 850 850 851 851 /*
+2 -2
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
··· 12 12 13 13 mbox-names = "rx", "tx"; 14 14 15 - mboxes= <&secure_proxy_main 11>, 16 - <&secure_proxy_main 13>; 15 + mboxes = <&secure_proxy_main 11>, 16 + <&secure_proxy_main 13>; 17 17 18 18 reg-names = "debug_messages"; 19 19 reg = <0x44083000 0x1000>;
+4 -4
arch/arm64/boot/dts/ti/k3-am654-base-board.dts
··· 10 10 #include <dt-bindings/net/ti-dp83867.h> 11 11 12 12 / { 13 - compatible = "ti,am654-evm", "ti,am654"; 13 + compatible = "ti,am654-evm", "ti,am654"; 14 14 model = "Texas Instruments AM654 Base Board"; 15 15 16 16 chosen { ··· 73 73 pinctrl-names = "default"; 74 74 pinctrl-0 = <&push_button_pins_default>; 75 75 76 - sw5 { 76 + switch-5 { 77 77 label = "GPIO Key USER1"; 78 78 linux,code = <BTN_0>; 79 79 gpios = <&wkup_gpio0 24 GPIO_ACTIVE_LOW>; 80 80 }; 81 81 82 - sw6 { 82 + switch-6 { 83 83 label = "GPIO Key USER2"; 84 84 linux,code = <BTN_1>; 85 85 gpios = <&wkup_gpio0 27 GPIO_ACTIVE_LOW>; ··· 330 330 pinctrl-names = "default"; 331 331 pinctrl-0 = <&main_spi0_pins_default>; 332 332 #address-cells = <1>; 333 - #size-cells= <0>; 333 + #size-cells = <0>; 334 334 ti,pindir-d0-out-d1-in; 335 335 336 336 flash@0 {
+2 -2
arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
··· 12 12 13 13 mbox-names = "rx", "tx"; 14 14 15 - mboxes= <&secure_proxy_main 11>, 16 - <&secure_proxy_main 13>; 15 + mboxes = <&secure_proxy_main 11>, 16 + <&secure_proxy_main 13>; 17 17 18 18 reg-names = "debug_messages"; 19 19 reg = <0x00 0x44083000 0x00 0x1000>;
+2 -2
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts
··· 26 26 pinctrl-names = "default"; 27 27 pinctrl-0 = <&sw10_button_pins_default &sw11_button_pins_default>; 28 28 29 - sw10: sw10 { 29 + sw10: switch-10 { 30 30 label = "GPIO Key USER1"; 31 31 linux,code = <BTN_0>; 32 32 gpios = <&main_gpio0 0 GPIO_ACTIVE_LOW>; 33 33 }; 34 34 35 - sw11: sw11 { 35 + sw11: switch-11 { 36 36 label = "GPIO Key USER2"; 37 37 linux,code = <BTN_1>; 38 38 gpios = <&wkup_gpio0 7 GPIO_ACTIVE_LOW>;
+2 -2
arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
··· 12 12 13 13 mbox-names = "rx", "tx"; 14 14 15 - mboxes= <&secure_proxy_main 11>, 16 - <&secure_proxy_main 13>; 15 + mboxes = <&secure_proxy_main 11>, 16 + <&secure_proxy_main 13>; 17 17 18 18 reg-names = "debug_messages"; 19 19 reg = <0x00 0x44083000 0x0 0x1000>;
+2 -2
arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
··· 320 320 interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; 321 321 power-domains = <&k3_pds 98 TI_SCI_PD_EXCLUSIVE>; 322 322 clocks = <&k3_clks 98 7>, <&k3_clks 98 1>; 323 - clock-names = "clk_ahb", "clk_xin"; 323 + clock-names = "clk_ahb", "clk_xin"; 324 324 assigned-clocks = <&k3_clks 98 1>; 325 325 assigned-clock-parents = <&k3_clks 98 2>; 326 326 bus-width = <8>; ··· 347 347 interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; 348 348 power-domains = <&k3_pds 99 TI_SCI_PD_EXCLUSIVE>; 349 349 clocks = <&k3_clks 99 8>, <&k3_clks 99 1>; 350 - clock-names = "clk_ahb", "clk_xin"; 350 + clock-names = "clk_ahb", "clk_xin"; 351 351 assigned-clocks = <&k3_clks 99 1>; 352 352 assigned-clock-parents = <&k3_clks 99 2>; 353 353 bus-width = <4>;
+2 -2
arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
··· 12 12 13 13 mbox-names = "rx", "tx"; 14 14 15 - mboxes= <&secure_proxy_main 11>, 16 - <&secure_proxy_main 13>; 15 + mboxes = <&secure_proxy_main 11>, 16 + <&secure_proxy_main 13>; 17 17 18 18 reg-names = "debug_messages"; 19 19 reg = <0x00 0x44083000 0x00 0x1000>;