Skip to content

Commit af3c684

Browse files
arndbarndb
committed
Merge tag 'ti-k3-dt-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
TI K3 device tree updates for v6.5 New Boards: phyBOARD-Lyra-AM625 Board support Toradex Verdin AM62 COM, carrier and dev boards New features: Across K3 SoCs: - Error Signaling Module(ESM) and Secproxy IPC modules - On board I2C EEPROM - Voltage Temp Monitoring (VTM) module - DM timers (GP Timers) J784s4: - R5 and C7x DSP remoteproc, ADC, QSPI AM69: - Addition of more peripherals: CPSW, eMMC, UARTs, I2C et al J721s2: - USB, Serdes, OSPI, PCIe AM62a: - Watchdog J721e: - HyperFlash/HyperBus AM62: - Type-C USB0 port Cleanups and non-urgent fixes Particularly large set of cleanups to get rid of dtbs_check errors and dtc warnings: - Addition of missing pinmux and uart nodes for AM64, AM62x, AM62A, J721e, J7200 that are used by bootloader - Split Pinmux regions/range to avoid holes for J721s2, J7200, J784s4 - Drop bootargs and unneeded aliases across all K3 SoCs - Move aliases to board dts files from SoC dtsi files - Move to generic node name for can, rtc nodes on am65 - s/-pins-default/default-pins/ to match upcoming pinctrl.yaml update - Fix pinctrl phandle references to use <> as separator where multiple entries are present * tag 'ti-k3-dt-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (153 commits) arm64: dts: ti: Unify pin group node names for make dtbs checks arm64: dts: ti: add verdin am62 yavia arm64: dts: ti: add verdin am62 dahlia arm64: dts: ti: add verdin am62 dt-bindings: arm: ti: add toradex,verdin-am62 et al. arm64: dts: ti: Add basic support for phyBOARD-Lyra-AM625 dt-bindings: arm: ti: Add bindings for PHYTEC AM62x based hardware arm64: dts: ti: k3-j7200-mcu-wakeup: Remove 0x unit address prefix from nodename arm64: dts: ti: k3-j721e-som-p0: Enable wakeup_i2c0 and eeprom arm64: dts: ti: k3-am64: Add ESM support arm64: dts: ti: k3-am62: Add ESM support arm64: dts: ti: k3-j7200: Add ESM support arm64: dts: ti: k3-j721e: Add ESM support dt-bindings: misc: esm: Add ESM support for TI K3 devices arm64: dts: ti: k3-j721s2-som-p0: Enable wakeup_i2c0 and eeprom arm64: dts: ti: k3-j721s2-common-proc-board: Add uart pinmux arm64: dts: ti: k3-am68-sk-som: Enable wakeup_i2c0 and eeprom arm64: dts: ti: k3-am68-sk-base-board: Add uart pinmux arm64: dts: ti: k3-am68-sk-base-board: Add pinmux for RPi Header arm64: dts: ti: k3-j721s2: Fix wkup pinmux range ... Link: https://lore.kernel.org/r/7fe0c6de-cb99-9c89-8583-b3855fde16f8@ti.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 5e64ee4 + a495681 commit af3c684

80 files changed

Lines changed: 8767 additions & 861 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/arm/ti/k3.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ properties:
2525
- ti,am62a7-sk
2626
- const: ti,am62a7
2727

28+
- description: K3 AM625 SoC PHYTEC phyBOARD-Lyra
29+
items:
30+
- const: phytec,am625-phyboard-lyra-rdk
31+
- const: phytec,am62-phycore-som
32+
- const: ti,am625
33+
2834
- description: K3 AM625 SoC
2935
items:
3036
- enum:
@@ -33,6 +39,26 @@ properties:
3339
- ti,am62-lp-sk
3440
- const: ti,am625
3541

42+
- description: K3 AM62x SoC Toradex Verdin Modules and Carrier Boards
43+
items:
44+
- enum:
45+
- toradex,verdin-am62-nonwifi-dahlia # Verdin AM62 Module on Dahlia
46+
- toradex,verdin-am62-nonwifi-dev # Verdin AM62 Module on Verdin Development Board
47+
- toradex,verdin-am62-nonwifi-yavia # Verdin AM62 Module on Yavia
48+
- const: toradex,verdin-am62-nonwifi # Verdin AM62 Module without Wi-Fi / BT
49+
- const: toradex,verdin-am62 # Verdin AM62 Module
50+
- const: ti,am625
51+
52+
- description: K3 AM62x SoC Toradex Verdin Modules and Carrier Boards with Wi-Fi / BT
53+
items:
54+
- enum:
55+
- toradex,verdin-am62-wifi-dahlia # Verdin AM62 Wi-Fi / BT Module on Dahlia
56+
- toradex,verdin-am62-wifi-dev # Verdin AM62 Wi-Fi / BT M. on Verdin Development B.
57+
- toradex,verdin-am62-wifi-yavia # Verdin AM62 Wi-Fi / BT Module on Yavia
58+
- const: toradex,verdin-am62-wifi # Verdin AM62 Wi-Fi / BT Module
59+
- const: toradex,verdin-am62 # Verdin AM62 Module
60+
- const: ti,am625
61+
3662
- description: K3 AM642 SoC
3763
items:
3864
- enum:

‎Documentation/devicetree/bindings/misc/ti,j721e-esm.yaml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (C) 2022 Texas Instruments Incorporated
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/misc/ti,j721e-esm.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Texas Instruments K3 ESM
9+
10+
maintainers:
11+
- Neha Malcom Francis <n-francis@ti.com>
12+
13+
description:
14+
The ESM (Error Signaling Module) is an IP block on TI K3 devices
15+
that allows handling of safety events somewhat similar to what interrupt
16+
controller would do. The safety signals have their separate paths within
17+
the SoC, and they are handled by the ESM, which routes them to the proper
18+
destination, which can be system reset, interrupt controller, etc. In the
19+
simplest configuration the signals are just routed to reset the SoC.
20+
21+
properties:
22+
compatible:
23+
const: ti,j721e-esm
24+
25+
reg:
26+
maxItems: 1
27+
28+
ti,esm-pins:
29+
$ref: /schemas/types.yaml#/definitions/uint32-array
30+
description:
31+
integer array of ESM interrupt pins to route to external event pin
32+
which can be used to reset the SoC.
33+
minItems: 1
34+
maxItems: 255
35+
36+
required:
37+
- compatible
38+
- reg
39+
- ti,esm-pins
40+
41+
additionalProperties: false
42+
43+
examples:
44+
- |
45+
bus {
46+
#address-cells = <2>;
47+
#size-cells = <2>;
48+
esm@700000 {
49+
compatible = "ti,j721e-esm";
50+
reg = <0x0 0x700000 0x0 0x1000>;
51+
ti,esm-pins = <344>, <345>;
52+
};
53+
};

‎arch/arm64/boot/dts/ti/Makefile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010

1111
# Boards with AM62x SoC
1212
dtb-$(CONFIG_ARCH_K3) += k3-am625-beagleplay.dtb
13+
dtb-$(CONFIG_ARCH_K3) += k3-am625-phyboard-lyra-rdk.dtb
1314
dtb-$(CONFIG_ARCH_K3) += k3-am625-sk.dtb
15+
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-dahlia.dtb
16+
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-dev.dtb
17+
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-yavia.dtb
18+
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dahlia.dtb
19+
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dev.dtb
20+
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-yavia.dtb
1421
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb
1522

1623
# Boards with AM62Ax SoC
@@ -22,12 +29,14 @@ dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-rdk.dtb
2229
dtb-$(CONFIG_ARCH_K3) += k3-am642-sk.dtb
2330

2431
# Boards with AM65x SoC
32+
k3-am654-gp-evm-dtbs := k3-am654-base-board.dtb k3-am654-base-board-rocktech-rk101-panel.dtbo
2533
dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic.dtb
2634
dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic-pg2.dtb
2735
dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced.dtb
2836
dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-m2.dtb
2937
dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-pg2.dtb
3038
dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb
39+
dtb-$(CONFIG_ARCH_K3) += k3-am654-gp-evm.dtb
3140

3241
# Boards with J7200 SoC
3342
k3-j7200-evm-dtbs := k3-j7200-common-proc-board.dtb k3-j7200-evm-quad-port-eth-exp.dtbo

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@
7373
};
7474

7575
&main_pmx0 {
76-
vddshv_sdio_pins_default: vddshv-sdio-pins-default {
76+
vddshv_sdio_pins_default: vddshv-sdio-default-pins {
7777
pinctrl-single,pins = <
7878
AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */
7979
>;
8080
};
8181

82-
main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-pins-default {
82+
main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-default-pins {
8383
pinctrl-single,pins = <
8484
AM62X_IOPAD(0x01d4, PIN_INPUT, 7) /* (C13) UART0_RTSn.GPIO1_23 */
8585
>;
8686
};
8787

88-
pmic_irq_pins_default: pmic-irq-pins-default {
88+
pmic_irq_pins_default: pmic-irq-default-pins {
8989
pinctrl-single,pins = <
9090
AM62X_IOPAD(0x01f4, PIN_INPUT, 0) /* (B16) EXTINTn */
9191
>;

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,21 @@
184184
dma-names = "tx", "rx1", "rx2";
185185
};
186186

187+
secure_proxy_sa3: mailbox@43600000 {
188+
compatible = "ti,am654-secure-proxy";
189+
#mbox-cells = <1>;
190+
reg-names = "target_data", "rt", "scfg";
191+
reg = <0x00 0x43600000 0x00 0x10000>,
192+
<0x00 0x44880000 0x00 0x20000>,
193+
<0x00 0x44860000 0x00 0x20000>;
194+
/*
195+
* Marked Disabled:
196+
* Node is incomplete as it is meant for bootloaders and
197+
* firmware on non-MPU processors
198+
*/
199+
status = "disabled";
200+
};
201+
187202
main_pmx0: pinctrl@f4000 {
188203
compatible = "pinctrl-single";
189204
reg = <0x00 0xf4000 0x00 0x2ac>;
@@ -192,6 +207,12 @@
192207
pinctrl-single,function-mask = <0xffffffff>;
193208
};
194209

210+
main_esm: esm@420000 {
211+
compatible = "ti,j721e-esm";
212+
reg = <0x00 0x420000 0x00 0x1000>;
213+
ti,esm-pins = <160>, <161>, <162>, <163>, <177>, <178>;
214+
};
215+
195216
main_timer0: timer@2400000 {
196217
compatible = "ti,am654-timer";
197218
reg = <0x00 0x2400000 0x00 0x400>;

‎arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414
pinctrl-single,function-mask = <0xffffffff>;
1515
};
1616

17+
mcu_esm: esm@4100000 {
18+
compatible = "ti,j721e-esm";
19+
reg = <0x00 0x4100000 0x00 0x1000>;
20+
ti,esm-pins = <0>, <1>, <2>, <85>;
21+
};
22+
1723
/*
1824
* The MCU domain timer interrupts are routed only to the ESM module,
1925
* and not currently available for Linux. The MCU domain timers are

0 commit comments

Comments
 (0)