Skip to content

Commit 99355a2

Browse files
arndbarndb
committed
Merge tag 'ti-k3-dt-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
TI K3 device tree updates for v6.6 New Boards: - TQ group's TQMaX4XxL AM64 SOM and MBaX4XxL carrier board - TI's AM62P5 Starter Kit (SK) New features: AM625: - Support for Display (parallel only) - hdmi+audio support for AM625-SK/BeaglePlay, TC358778 DPI to MIPI-DSI bridge support for verdin. - MCU MCAN support and enable of Toradex Verdin - Toradex Verdin Dahlia audio support AM62A7: - MCU MCAN support - Enable USB Dual Role Device(DRD) support for AM62A7 Starter Kit(SK). AM64: - TQ group's tqma64xxl: Overlays for SD-card and wlan. J721E: - Main domain CPSW9G and correponding gateway/ethernet switch expansion - GESI board. J721S2/AM68: - New CAN instances, ehrpwm, Display (DSS) and am68-sk HDMI support - Main domain CPSW2G and correponding gateway/ethernet switch expansion - GESI board. J784S4/AM69: - Boot phase tag marking in device tree - UFS support Cleanups and non-urgent fixes: - Cosmetic style fixups around "=" and "{" whitespace usage. - Fixups across multiple SoCs/boards for pwm-tbclk to matchup with bindings - Serdes header file include/dt-bindings/mux/ti-serdes.h is now deprecated, use k3-serdes.h in soc dtsi folder. - All SoCs: Enable GPIO/SDHCI/OSPI/TSADC/C6/C7 DSP nodes at the board level. - Fixups for AM62: Crypto powerdomains are conditional to better represent control of the crypto engines by security controller. - Fixups for j721e: Duplicate wakeup_i2c node dropped for SoM board. - Fixups for j721s2/am68: pimux offsets for OSPI. - Fixups for j784s4/am69: Fixups for pinmux for ospi/adc interrupt ranges for wkup/main gpios * tag 'ti-k3-dt-for-v6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (68 commits) arm64: dts: ti: verdin-am62: Add DSI display support arm64: dts: ti: Add support for the AM62P5 Starter Kit arm64: dts: ti: Introduce AM62P5 family of SoCs dt-bindings: arm: ti: Add bindings for AM62P5 SoCs arm64: dts: ti: k3-am69-sk: Add phase tags marking arm64: dts: ti: k3-j784s4-evm: Add phase tags marking arm64: dts: ti: k3-j784s4: Add phase tags marking arm64: dts: ti: k3-am625-beagleplay: Add HDMI support arm64: dts: ti: am62x-sk: Add overlay for HDMI audio arm64: dts: ti: k3-am62x-sk-common: Add HDMI support arm64: dts: ti: k3-am62-main: Add node for DSS arm64: dts: ti: k3-am62x-sk-common: Update main-i2c1 frequency arm64: dts: ti: k3-j721e: Enable C6x DSP nodes at the board level arm64: dts: ti: k3-j784s4: Enable C7x DSP nodes at the board level arm64: dts: ti: k3-j721e: Enable C7x DSP nodes at the board level arm64: dts: ti: k3-*: fix fss node dtbs check warnings arm64: dts: ti: k3-am64: Enable TSCADC nodes at the board level arm64: dts: ti: k3-am65: Enable TSCADC nodes at the board level arm64: dts: ti: k3-j721e: Enable TSCADC nodes at the board level arm64: dts: ti: k3-j7200: Enable GPIO nodes at the board level ... Link: https://lore.kernel.org/r/20230814160651.frxohyshd2evp2k4@expenses Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f0df584 + 9e77200 commit 99355a2

66 files changed

Lines changed: 3575 additions & 381 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: 13 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 AM62P5 SoC and Boards
29+
items:
30+
- enum:
31+
- ti,am62p5-sk
32+
- const: ti,am62p5
33+
2834
- description: K3 AM625 SoC PHYTEC phyBOARD-Lyra
2935
items:
3036
- const: phytec,am625-phyboard-lyra-rdk
@@ -72,6 +78,13 @@ properties:
7278
- const: phytec,am64-phycore-som
7379
- const: ti,am642
7480

81+
- description: K3 AM642 SoC on TQ-Systems TQMaX4XxL SoM
82+
items:
83+
- enum:
84+
- tq,am642-tqma6442l-mbax4xxl # MBaX4XxL base board
85+
- const: tq,am642-tqma6442l
86+
- const: ti,am642
87+
7588
- description: K3 AM654 SoC
7689
items:
7790
- enum:

‎Documentation/devicetree/bindings/crypto/ti,sa2ul.yaml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,22 @@ patternProperties:
6666
required:
6767
- compatible
6868
- reg
69-
- power-domains
7069
- dmas
7170
- dma-names
7271

72+
allOf:
73+
- if:
74+
properties:
75+
compatible:
76+
contains:
77+
const: ti,am62-sa3ul
78+
then:
79+
properties:
80+
power-domains: false
81+
else:
82+
required:
83+
- power-domains
84+
7385
additionalProperties: false
7486

7587
examples:

‎Documentation/devicetree/bindings/soc/ti/k3-ringacc.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,22 @@ properties:
3434
- const: ti,am654-navss-ringacc
3535

3636
reg:
37+
minItems: 4
3738
items:
3839
- description: real time registers regions
3940
- description: fifos registers regions
4041
- description: proxy gcfg registers regions
4142
- description: proxy target registers regions
43+
- description: configuration registers region
4244

4345
reg-names:
46+
minItems: 4
4447
items:
4548
- const: rt
4649
- const: fifos
4750
- const: proxy_gcfg
4851
- const: proxy_target
52+
- const: cfg
4953

5054
msi-parent: true
5155

@@ -80,8 +84,9 @@ examples:
8084
reg = <0x0 0x3c000000 0x0 0x400000>,
8185
<0x0 0x38000000 0x0 0x400000>,
8286
<0x0 0x31120000 0x0 0x100>,
83-
<0x0 0x33000000 0x0 0x40000>;
84-
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target";
87+
<0x0 0x33000000 0x0 0x40000>,
88+
<0x0 0x31080000 0x0 0x40000>;
89+
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg";
8590
ti,num-rings = <818>;
8691
ti,sci-rm-range-gp-rings = <0x2>; /* GP ring range */
8792
ti,sci = <&dmsc>;

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,27 @@ dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dahlia.dtb
1919
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dev.dtb
2020
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-yavia.dtb
2121
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb
22+
dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-hdmi-audio.dtbo
2223

2324
# Boards with AM62Ax SoC
2425
dtb-$(CONFIG_ARCH_K3) += k3-am62a7-sk.dtb
2526

27+
# Boards with AM62Px SoC
28+
dtb-$(CONFIG_ARCH_K3) += k3-am62p5-sk.dtb
29+
2630
# Boards with AM64x SoC
2731
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm.dtb
2832
dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-rdk.dtb
2933
dtb-$(CONFIG_ARCH_K3) += k3-am642-sk.dtb
34+
dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl.dtb
35+
36+
k3-am642-tqma64xxl-mbax4xxl-sdcard-dtbs := \
37+
k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
38+
k3-am642-tqma64xxl-mbax4xxl-wlan-dtbs := \
39+
k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-wlan.dtbo
40+
41+
dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl-sdcard.dtb
42+
dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl-wlan.dtb
3043

3144
# Boards with AM65x SoC
3245
k3-am654-gp-evm-dtbs := k3-am654-base-board.dtb k3-am654-base-board-rocktech-rk101-panel.dtbo
@@ -46,15 +59,21 @@ dtb-$(CONFIG_ARCH_K3) += k3-j7200-evm.dtb
4659
k3-j721e-evm-dtbs := k3-j721e-common-proc-board.dtb k3-j721e-evm-quad-port-eth-exp.dtbo
4760
dtb-$(CONFIG_ARCH_K3) += k3-j721e-beagleboneai64.dtb
4861
dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm.dtb
62+
dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm-gesi-exp-board.dtbo
4963
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb
5064

5165
# Boards with J721s2 SoC
5266
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
5367
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb
68+
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-gesi-exp-board.dtbo
5469

5570
# Boards with J784s4 SoC
5671
dtb-$(CONFIG_ARCH_K3) += k3-am69-sk.dtb
5772
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm.dtb
5873

5974
# Enable support for device-tree overlays
75+
DTC_FLAGS_k3-am625-sk += -@
76+
DTC_FLAGS_k3-am62-lp-sk += -@
6077
DTC_FLAGS_k3-am6548-iot2050-advanced-m2 += -@
78+
DTC_FLAGS_k3-j721e-common-proc-board += -@
79+
DTC_FLAGS_k3-j721s2-common-proc-board += -@

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

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,29 @@
5555
#phy-cells = <1>;
5656
};
5757

58-
epwm_tbclk: clock@4130 {
59-
compatible = "ti,am62-epwm-tbclk", "syscon";
58+
epwm_tbclk: clock-controller@4130 {
59+
compatible = "ti,am62-epwm-tbclk";
6060
reg = <0x4130 0x4>;
6161
#clock-cells = <1>;
6262
};
63+
64+
audio_refclk0: clock-controller@82e0 {
65+
compatible = "ti,am62-audio-refclk";
66+
reg = <0x82e0 0x4>;
67+
clocks = <&k3_clks 157 0>;
68+
assigned-clocks = <&k3_clks 157 0>;
69+
assigned-clock-parents = <&k3_clks 157 8>;
70+
#clock-cells = <0>;
71+
};
72+
73+
audio_refclk1: clock-controller@82e4 {
74+
compatible = "ti,am62-audio-refclk";
75+
reg = <0x82e4 0x4>;
76+
clocks = <&k3_clks 157 10>;
77+
assigned-clocks = <&k3_clks 157 10>;
78+
assigned-clock-parents = <&k3_clks 157 18>;
79+
#clock-cells = <0>;
80+
};
6381
};
6482

6583
dmss: bus@48000000 {
@@ -174,7 +192,6 @@
174192
crypto: crypto@40900000 {
175193
compatible = "ti,am62-sa3ul";
176194
reg = <0x00 0x40900000 0x00 0x1200>;
177-
power-domains = <&k3_pds 70 TI_SCI_PD_SHARED>;
178195
#address-cells = <2>;
179196
#size-cells = <2>;
180197
ranges = <0x00 0x40900000 0x00 0x40900000 0x00 0x30000>;
@@ -590,7 +607,7 @@
590607

591608
usb0: usb@31000000 {
592609
compatible = "snps,dwc3";
593-
reg =<0x00 0x31000000 0x00 0x50000>;
610+
reg = <0x00 0x31000000 0x00 0x50000>;
594611
interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */
595612
<GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>; /* irq.0 */
596613
interrupt-names = "host", "peripheral";
@@ -613,7 +630,7 @@
613630

614631
usb1: usb@31100000 {
615632
compatible = "snps,dwc3";
616-
reg =<0x00 0x31100000 0x00 0x50000>;
633+
reg = <0x00 0x31100000 0x00 0x50000>;
617634
interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */
618635
<GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>; /* irq.0 */
619636
interrupt-names = "host", "peripheral";
@@ -718,6 +735,31 @@
718735
};
719736
};
720737

738+
dss: dss@30200000 {
739+
compatible = "ti,am625-dss";
740+
reg = <0x00 0x30200000 0x00 0x1000>, /* common */
741+
<0x00 0x30202000 0x00 0x1000>, /* vidl1 */
742+
<0x00 0x30206000 0x00 0x1000>, /* vid */
743+
<0x00 0x30207000 0x00 0x1000>, /* ovr1 */
744+
<0x00 0x30208000 0x00 0x1000>, /* ovr2 */
745+
<0x00 0x3020a000 0x00 0x1000>, /* vp1: Used for OLDI */
746+
<0x00 0x3020b000 0x00 0x1000>; /* vp2: Used as DPI Out */
747+
reg-names = "common", "vidl1", "vid",
748+
"ovr1", "ovr2", "vp1", "vp2";
749+
power-domains = <&k3_pds 186 TI_SCI_PD_EXCLUSIVE>;
750+
clocks = <&k3_clks 186 6>,
751+
<&dss_vp1_clk>,
752+
<&k3_clks 186 2>;
753+
clock-names = "fck", "vp1", "vp2";
754+
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
755+
status = "disabled";
756+
757+
dss_ports: ports {
758+
#address-cells = <1>;
759+
#size-cells = <0>;
760+
};
761+
};
762+
721763
hwspinlock: spinlock@2a000000 {
722764
compatible = "ti,am64-hwspinlock";
723765
reg = <0x00 0x2a000000 0x00 0x1000>;

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,28 @@
147147
/* Tightly coupled to M4F */
148148
status = "reserved";
149149
};
150+
151+
mcu_mcan0: can@4e08000 {
152+
compatible = "bosch,m_can";
153+
reg = <0x00 0x4e08000 0x00 0x200>,
154+
<0x00 0x4e00000 0x00 0x8000>;
155+
reg-names = "m_can", "message_ram";
156+
power-domains = <&k3_pds 188 TI_SCI_PD_EXCLUSIVE>;
157+
clocks = <&k3_clks 188 6>, <&k3_clks 188 1>;
158+
clock-names = "hclk", "cclk";
159+
bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
160+
status = "disabled";
161+
};
162+
163+
mcu_mcan1: can@4e18000 {
164+
compatible = "bosch,m_can";
165+
reg = <0x00 0x4e18000 0x00 0x200>,
166+
<0x00 0x4e10000 0x00 0x8000>;
167+
reg-names = "m_can", "message_ram";
168+
power-domains = <&k3_pds 189 TI_SCI_PD_EXCLUSIVE>;
169+
clocks = <&k3_clks 189 6>, <&k3_clks 189 1>;
170+
clock-names = "hclk", "cclk";
171+
bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
172+
status = "disabled";
173+
};
150174
};

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,43 @@
88
* https://www.toradex.com/products/carrier-board/dahlia-carrier-board-kit
99
*/
1010

11+
/ {
12+
reg_1v8_sw: regulator-1v8-sw {
13+
compatible = "regulator-fixed";
14+
regulator-max-microvolt = <1800000>;
15+
regulator-min-microvolt = <1800000>;
16+
regulator-name = "On-carrier +V1.8_SW";
17+
};
18+
19+
sound {
20+
compatible = "simple-audio-card";
21+
simple-audio-card,bitclock-master = <&codec_dai>;
22+
simple-audio-card,format = "i2s";
23+
simple-audio-card,frame-master = <&codec_dai>;
24+
simple-audio-card,name = "verdin-wm8904";
25+
simple-audio-card,routing =
26+
"Headphone Jack", "HPOUTL",
27+
"Headphone Jack", "HPOUTR",
28+
"IN2L", "Line In Jack",
29+
"IN2R", "Line In Jack",
30+
"Headphone Jack", "MICBIAS",
31+
"IN1L", "Headphone Jack";
32+
simple-audio-card,widgets =
33+
"Microphone", "Headphone Jack",
34+
"Headphone", "Headphone Jack",
35+
"Line", "Line In Jack";
36+
37+
codec_dai: simple-audio-card,codec {
38+
clocks = <&audio_refclk1>;
39+
sound-dai = <&wm8904_1a>;
40+
};
41+
42+
simple-audio-card,cpu {
43+
sound-dai = <&mcasp0>;
44+
};
45+
};
46+
};
47+
1148
/* Verdin ETHs */
1249
&cpsw3g {
1350
status = "okay";
@@ -46,6 +83,22 @@
4683
&main_i2c1 {
4784
status = "okay";
4885

86+
/* Audio Codec */
87+
wm8904_1a: audio-codec@1a {
88+
compatible = "wlf,wm8904";
89+
reg = <0x1a>;
90+
pinctrl-names = "default";
91+
pinctrl-0 = <&pinctrl_i2s1_mclk>;
92+
#sound-dai-cells = <0>;
93+
clocks = <&audio_refclk1>;
94+
clock-names = "mclk";
95+
AVDD-supply = <&reg_1v8_sw>;
96+
CPVDD-supply = <&reg_1v8_sw>;
97+
DBVDD-supply = <&reg_1v8_sw>;
98+
DCVDD-supply = <&reg_1v8_sw>;
99+
MICVDD-supply = <&reg_1v8_sw>;
100+
};
101+
49102
/* Current measurement into module VCC */
50103
hwmon@40 {
51104
compatible = "ti,ina219";
@@ -115,6 +168,11 @@
115168
status = "okay";
116169
};
117170

171+
/* Verdin CAN_2 */
172+
&mcu_mcan0 {
173+
status = "okay";
174+
};
175+
118176
/* Verdin UART_4 */
119177
&mcu_uart0 {
120178
status = "okay";

0 commit comments

Comments
 (0)