Skip to content

Commit d745bdc

Browse files
arndbarndb
committed
Merge tag 'ti-k3-dt-for-v6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
TI K3 device tree updates for v6.13 Generic Fixups/Cleanups: - Cleanup bootph-* tags to limit to leaf nodes only - clock IDs for MCSPI instances fixed up across J7xx family - Misc indentation and whitespace cleanup across dts New SoC - J742s2 which is a cutdown of existing J784s4 and uses same EVM SoC Specific features and Fixes: - eQEP (counter) support across AM64/AM62/AM62A AM64 - M4F Remoteproc support - stats collection support for ICSSGs via ti,pa-stats - Add PCIe EP overlays AM65 - stats collection support for ICSSGs via ti,pa-stats AM62: - M4F Remoteproc support - eMMC/SD TAP value updates - dtbs_check fixes for opp_efuse_table AM62A - 1.4GHz opp entry AM62P - 1.4GHz opp entry J7200 - Add PCIe EP overlays - Pinmux node reg range fixes Board Specific AM62 - am62 verdin ivy carrier board support - am625-verdin TPM device support - am62 verdin ivy board support - Beagleplay Mikrobus PWM header support - am62-verdin increase SD regulator startup delay AM64 - am642-phyboard-electra-rdk trickle charger support - am64-phy* drop buswidth from sdhci nodes * tag 'ti-k3-dt-for-v6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (61 commits) arm64: dts: ti: k3-am62: use opp_efuse_table for opp-table syscon arm64: dts: ti: k3-am62p5-sk: add 1.4ghz opp entry arm64: dts: ti: k3-am62p: add opp frequencies arm64: dts: ti: k3-am62a7-sk: add 1.4ghz opp entry arm64: dts: ti: k3-am62a: add opp frequencies arm64: dts: ti: k3-am62-verdin: Add Ivy carrier board arm64: dts: ti: k3-am62-verdin: add label to som adc node dt-bindings: arm: ti: Add verdin am62 ivy board arm64: dts: ti: k3-am642-phyboard-electra-rdk: Enable trickle charger arm64: dts: ti: k3-am64-phycore-som: Add M4F remoteproc nodes arm64: dts: ti: k3-am62-phycore-som: Add M4F remoteproc nodes arm64: dts: ti: minor whitespace cleanup arm64: dts: ti: k3-am62x-phyboard-lyra: Fix indentation in audio-card arm64: dts: ti: k3-am642-phyboard-electra-rdk: Fix bus-width property in MMC nodes arm64: dts: ti: k3-am64-phycore-som: Fix bus-width property in MMC nodes arm64: dts: ti: k3-am642-evm: Add overlay for PCIe0 EP mode arm64: dts: ti: k3-j7200-evm: Add overlay for PCIE1 Endpoint Mode arm64: dts: ti: k3-am62-main: Update otap/itap values arm64: dts: ti: k3-am625-beagleplay: Enable MikroBUS PWM arm64: dts: ti: k3-am62-verdin: Fix SD regulator startup delay ... Link: https://lore.kernel.org/r/3ded4795-2186-4e06-bda6-9c9a65a3fdb9@ti.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents f0cba6f + 767b6a0 commit d745bdc

62 files changed

Lines changed: 6066 additions & 4463 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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ properties:
5656
- enum:
5757
- toradex,verdin-am62-nonwifi-dahlia # Verdin AM62 Module on Dahlia
5858
- toradex,verdin-am62-nonwifi-dev # Verdin AM62 Module on Verdin Development Board
59+
- toradex,verdin-am62-nonwifi-ivy # Verdin AM62 Module on Ivy
5960
- toradex,verdin-am62-nonwifi-mallow # Verdin AM62 Module on Mallow
6061
- toradex,verdin-am62-nonwifi-yavia # Verdin AM62 Module on Yavia
6162
- const: toradex,verdin-am62-nonwifi # Verdin AM62 Module without Wi-Fi / BT
@@ -67,6 +68,7 @@ properties:
6768
- enum:
6869
- toradex,verdin-am62-wifi-dahlia # Verdin AM62 Wi-Fi / BT Module on Dahlia
6970
- toradex,verdin-am62-wifi-dev # Verdin AM62 Wi-Fi / BT M. on Verdin Development B.
71+
- toradex,verdin-am62-wifi-ivy # Verdin AM62 Wi-Fi / BT Module on Ivy
7072
- toradex,verdin-am62-wifi-mallow # Verdin AM62 Wi-Fi / BT Module on Mallow
7173
- toradex,verdin-am62-wifi-yavia # Verdin AM62 Wi-Fi / BT Module on Yavia
7274
- const: toradex,verdin-am62-wifi # Verdin AM62 Wi-Fi / BT Module
@@ -144,6 +146,12 @@ properties:
144146
- ti,j722s-evm
145147
- const: ti,j722s
146148

149+
- description: K3 J742S2 SoC
150+
items:
151+
- enum:
152+
- ti,j742s2-evm
153+
- const: ti,j742s2
154+
147155
- description: K3 J784s4 SoC
148156
items:
149157
- enum:

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@ dtb-$(CONFIG_ARCH_K3) += k3-am625-phyboard-lyra-rdk.dtb
1616
dtb-$(CONFIG_ARCH_K3) += k3-am625-sk.dtb
1717
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-dahlia.dtb
1818
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-dev.dtb
19+
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-ivy.dtb
1920
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-mallow.dtb
2021
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-yavia.dtb
2122
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dahlia.dtb
2223
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dev.dtb
24+
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-ivy.dtb
2325
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-mallow.dtb
2426
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-yavia.dtb
25-
dtb-$(CONFIG_ARCH_K3) += k3-am625-phyboard-lyra-1-4-ghz-opp.dtbo
2627
dtb-$(CONFIG_ARCH_K3) += k3-am62x-phyboard-lyra-gpio-fan.dtbo
2728
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb
2829
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk-nand.dtbo
@@ -48,6 +49,7 @@ k3-am642-hummingboard-t-usb3-dtbs := \
4849
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm.dtb
4950
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac.dtbo
5051
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac-mii.dtbo
52+
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-pcie0-ep.dtbo
5153
dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t.dtb
5254
dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-pcie.dtb
5355
dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-usb3.dtb
@@ -96,6 +98,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-am654-pcie-usb3.dtbo
9698
# Boards with J7200 SoC
9799
k3-j7200-evm-dtbs := k3-j7200-common-proc-board.dtb k3-j7200-evm-quad-port-eth-exp.dtbo
98100
dtb-$(CONFIG_ARCH_K3) += k3-j7200-evm.dtb
101+
dtb-$(CONFIG_ARCH_K3) += k3-j7200-evm-pcie1-ep.dtbo
99102

100103
# Boards with J721e SoC
101104
k3-j721e-evm-dtbs := k3-j721e-common-proc-board.dtb k3-j721e-evm-quad-port-eth-exp.dtbo
@@ -126,13 +129,14 @@ dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-pcie0-pcie1-ep.dtbo
126129
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-quad-port-eth-exp1.dtbo
127130
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-usxgmii-exp1-exp2.dtbo
128131

132+
# Boards with J742S2 SoC
133+
dtb-$(CONFIG_ARCH_K3) += k3-j742s2-evm.dtb
134+
129135
# Build time test only, enabled by CONFIG_OF_ALL_DTBS
130136
k3-am625-beagleplay-csi2-ov5640-dtbs := k3-am625-beagleplay.dtb \
131137
k3-am625-beagleplay-csi2-ov5640.dtbo
132138
k3-am625-beagleplay-csi2-tevi-ov5640-dtbs := k3-am625-beagleplay.dtb \
133139
k3-am625-beagleplay-csi2-tevi-ov5640.dtbo
134-
k3-am625-phyboard-lyra-1-4-ghz-opp.dtbs := k3-am625-phyboard-lyra-rdk.dtb \
135-
k3-am625-phyboard-lyra-1-4-ghz-opp.dtbo
136140
k3-am625-phyboard-lyra-disable-eth-phy-dtbs := k3-am625-phyboard-lyra-rdk.dtb \
137141
k3-am6xx-phycore-disable-eth-phy.dtbo
138142
k3-am625-phyboard-lyra-disable-rtc-dtbs := k3-am625-phyboard-lyra-rdk.dtb \
@@ -168,6 +172,8 @@ k3-am642-evm-icssg1-dualemac-dtbs := \
168172
k3-am642-evm.dtb k3-am642-evm-icssg1-dualemac.dtbo
169173
k3-am642-evm-icssg1-dualemac-mii-dtbs := \
170174
k3-am642-evm.dtb k3-am642-evm-icssg1-dualemac-mii.dtbo
175+
k3-am642-evm-pcie0-ep-dtbs := \
176+
k3-am642-evm.dtb k3-am642-evm-pcie0-ep.dtbo
171177
k3-am642-phyboard-electra-disable-eth-phy-dtbs := \
172178
k3-am642-phyboard-electra-rdk.dtb k3-am6xx-phycore-disable-eth-phy.dtbo
173179
k3-am642-phyboard-electra-disable-rtc-dtbs := \
@@ -188,6 +194,8 @@ k3-am68-sk-base-board-csi2-dual-imx219-dtbs := k3-am68-sk-base-board.dtb \
188194
k3-j721e-sk-csi2-dual-imx219.dtbo
189195
k3-am69-sk-csi2-dual-imx219-dtbs := k3-am69-sk.dtb \
190196
k3-j721e-sk-csi2-dual-imx219.dtbo
197+
k3-j7200-evm-pcie1-ep-dtbs := k3-j7200-common-proc-board.dtb \
198+
k3-j7200-evm-pcie1-ep.dtbo
191199
k3-j721e-common-proc-board-infotainment-dtbs := k3-j721e-common-proc-board.dtb \
192200
k3-j721e-common-proc-board-infotainment.dtbo
193201
k3-j721e-evm-pcie0-ep-dtbs := k3-j721e-common-proc-board.dtb \
@@ -217,10 +225,12 @@ dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
217225
k3-am62p5-sk-csi2-tevi-ov5640.dtb \
218226
k3-am642-evm-icssg1-dualemac.dtb \
219227
k3-am642-evm-icssg1-dualemac-mii.dtb \
228+
k3-am642-evm-pcie0-ep.dtb \
220229
k3-am642-tqma64xxl-mbax4xxl-sdcard.dtb \
221230
k3-am642-tqma64xxl-mbax4xxl-wlan.dtb \
222231
k3-am68-sk-base-board-csi2-dual-imx219.dtb \
223232
k3-am69-sk-csi2-dual-imx219.dtb \
233+
k3-j7200-evm-pcie1-ep.dtbo \
224234
k3-j721e-common-proc-board-infotainment.dtb \
225235
k3-j721e-evm-pcie0-ep.dtb \
226236
k3-j721e-sk-csi2-dual-imx219.dtb \
@@ -243,7 +253,9 @@ DTC_FLAGS_k3-am642-tqma64xxl-mbax4xxl += -@
243253
DTC_FLAGS_k3-am6548-iot2050-advanced-m2 += -@
244254
DTC_FLAGS_k3-am68-sk-base-board += -@
245255
DTC_FLAGS_k3-am69-sk += -@
256+
DTC_FLAGS_k3-j7200-common-proc-board += -@
246257
DTC_FLAGS_k3-j721e-common-proc-board += -@
247258
DTC_FLAGS_k3-j721e-sk += -@
248259
DTC_FLAGS_k3-j721s2-common-proc-board += -@
249260
DTC_FLAGS_k3-j784s4-evm += -@
261+
DTC_FLAGS_k3-j742s2-evm += -@

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

Lines changed: 50 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -561,10 +561,9 @@
561561
ti,clkbuf-sel = <0x7>;
562562
ti,otap-del-sel-legacy = <0x0>;
563563
ti,otap-del-sel-mmc-hs = <0x0>;
564-
ti,otap-del-sel-ddr52 = <0x5>;
565-
ti,otap-del-sel-hs200 = <0x5>;
566-
ti,itap-del-sel-legacy = <0xa>;
567-
ti,itap-del-sel-mmc-hs = <0x1>;
564+
ti,otap-del-sel-hs200 = <0x6>;
565+
ti,itap-del-sel-legacy = <0x0>;
566+
ti,itap-del-sel-mmc-hs = <0x0>;
568567
status = "disabled";
569568
};
570569

@@ -577,17 +576,17 @@
577576
clock-names = "clk_ahb", "clk_xin";
578577
bus-width = <4>;
579578
ti,clkbuf-sel = <0x7>;
580-
ti,otap-del-sel-legacy = <0x8>;
579+
ti,otap-del-sel-legacy = <0x0>;
581580
ti,otap-del-sel-sd-hs = <0x0>;
582-
ti,otap-del-sel-sdr12 = <0x0>;
583-
ti,otap-del-sel-sdr25 = <0x0>;
584-
ti,otap-del-sel-sdr50 = <0x8>;
585-
ti,otap-del-sel-sdr104 = <0x7>;
586-
ti,otap-del-sel-ddr50 = <0x4>;
587-
ti,itap-del-sel-legacy = <0xa>;
588-
ti,itap-del-sel-sd-hs = <0x1>;
589-
ti,itap-del-sel-sdr12 = <0xa>;
590-
ti,itap-del-sel-sdr25 = <0x1>;
581+
ti,otap-del-sel-sdr12 = <0xf>;
582+
ti,otap-del-sel-sdr25 = <0xf>;
583+
ti,otap-del-sel-sdr50 = <0xc>;
584+
ti,otap-del-sel-sdr104 = <0x6>;
585+
ti,otap-del-sel-ddr50 = <0x9>;
586+
ti,itap-del-sel-legacy = <0x0>;
587+
ti,itap-del-sel-sd-hs = <0x0>;
588+
ti,itap-del-sel-sdr12 = <0x0>;
589+
ti,itap-del-sel-sdr25 = <0x0>;
591590
status = "disabled";
592591
};
593592

@@ -600,17 +599,17 @@
600599
clock-names = "clk_ahb", "clk_xin";
601600
bus-width = <4>;
602601
ti,clkbuf-sel = <0x7>;
603-
ti,otap-del-sel-legacy = <0x8>;
602+
ti,otap-del-sel-legacy = <0x0>;
604603
ti,otap-del-sel-sd-hs = <0x0>;
605-
ti,otap-del-sel-sdr12 = <0x0>;
606-
ti,otap-del-sel-sdr25 = <0x0>;
607-
ti,otap-del-sel-sdr50 = <0x8>;
608-
ti,otap-del-sel-sdr104 = <0x7>;
609-
ti,otap-del-sel-ddr50 = <0x8>;
610-
ti,itap-del-sel-legacy = <0xa>;
611-
ti,itap-del-sel-sd-hs = <0xa>;
612-
ti,itap-del-sel-sdr12 = <0xa>;
613-
ti,itap-del-sel-sdr25 = <0x1>;
604+
ti,otap-del-sel-sdr12 = <0xf>;
605+
ti,otap-del-sel-sdr25 = <0xf>;
606+
ti,otap-del-sel-sdr50 = <0xc>;
607+
ti,otap-del-sel-sdr104 = <0x6>;
608+
ti,otap-del-sel-ddr50 = <0x9>;
609+
ti,itap-del-sel-legacy = <0x0>;
610+
ti,itap-del-sel-sd-hs = <0x0>;
611+
ti,itap-del-sel-sdr12 = <0x0>;
612+
ti,itap-del-sel-sdr25 = <0x0>;
614613
status = "disabled";
615614
};
616615

@@ -843,6 +842,33 @@
843842
status = "disabled";
844843
};
845844

845+
eqep0: counter@23200000 {
846+
compatible = "ti,am62-eqep";
847+
reg = <0x00 0x23200000 0x00 0x100>;
848+
power-domains = <&k3_pds 59 TI_SCI_PD_EXCLUSIVE>;
849+
clocks = <&k3_clks 59 0>;
850+
interrupts = <GIC_SPI 116 IRQ_TYPE_EDGE_RISING>;
851+
status = "disabled";
852+
};
853+
854+
eqep1: counter@23210000 {
855+
compatible = "ti,am62-eqep";
856+
reg = <0x00 0x23210000 0x00 0x100>;
857+
power-domains = <&k3_pds 60 TI_SCI_PD_EXCLUSIVE>;
858+
clocks = <&k3_clks 60 0>;
859+
interrupts = <GIC_SPI 117 IRQ_TYPE_EDGE_RISING>;
860+
status = "disabled";
861+
};
862+
863+
eqep2: counter@23220000 {
864+
compatible = "ti,am62-eqep";
865+
reg = <0x00 0x23220000 0x00 0x100>;
866+
power-domains = <&k3_pds 62 TI_SCI_PD_EXCLUSIVE>;
867+
clocks = <&k3_clks 62 0>;
868+
interrupts = <GIC_SPI 118 IRQ_TYPE_EDGE_RISING>;
869+
status = "disabled";
870+
};
871+
846872
main_mcan0: can@20701000 {
847873
compatible = "bosch,m_can";
848874
reg = <0x00 0x20701000 0x00 0x200>,

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,4 +174,17 @@
174174
bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
175175
status = "disabled";
176176
};
177+
178+
mcu_m4fss: m4fss@5000000 {
179+
compatible = "ti,am64-m4fss";
180+
reg = <0x00 0x5000000 0x00 0x30000>,
181+
<0x00 0x5040000 0x00 0x10000>;
182+
reg-names = "iram", "dram";
183+
resets = <&k3_reset 9 1>;
184+
firmware-name = "am62-mcu-m4f0_0-fw";
185+
ti,sci = <&dmsc>;
186+
ti,sci-dev-id = <9>;
187+
ti,sci-proc-ids = <0x18 0xff>;
188+
status = "disabled";
189+
};
177190
};

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

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,18 @@
4545
pmsg-size = <0x8000>;
4646
};
4747

48+
mcu_m4fss_dma_memory_region: m4f-dma-memory@9cb00000 {
49+
compatible = "shared-dma-pool";
50+
reg = <0x00 0x9cb00000 0x00 0x100000>;
51+
no-map;
52+
};
53+
54+
mcu_m4fss_memory_region: m4f-memory@9cc00000 {
55+
compatible = "shared-dma-pool";
56+
reg = <0x00 0x9cc00000 0x00 0xe00000>;
57+
no-map;
58+
};
59+
4860
secure_tfa_ddr: tfa@9e780000 {
4961
reg = <0x00 0x9e780000 0x00 0x80000>;
5062
alignment = <0x1000>;
@@ -173,6 +185,13 @@
173185
};
174186
};
175187

188+
&a53_opp_table {
189+
opp-1400000000 {
190+
opp-hz = /bits/ 64 <1400000000>;
191+
opp-supported-hw = <0x01 0x0004>;
192+
};
193+
};
194+
176195
&cpsw3g {
177196
pinctrl-names = "default";
178197
pinctrl-0 = <&main_rgmii1_pins_default>;
@@ -196,6 +215,13 @@
196215
};
197216
};
198217

218+
&mailbox0_cluster0 {
219+
mbox_m4_0: mbox-m4-0 {
220+
ti,mbox-rx = <0 0 0>;
221+
ti,mbox-tx = <1 0 0>;
222+
};
223+
};
224+
199225
&main_i2c0 {
200226
pinctrl-names = "default";
201227
pinctrl-0 = <&main_i2c0_pins_default>;
@@ -226,8 +252,8 @@
226252
regulators {
227253
vdd_core: buck1 {
228254
regulator-name = "VDD_CORE";
229-
regulator-min-microvolt = <750000>;
230-
regulator-max-microvolt = <750000>;
255+
regulator-min-microvolt = <850000>;
256+
regulator-max-microvolt = <850000>;
231257
regulator-boot-on;
232258
regulator-always-on;
233259
};
@@ -295,6 +321,13 @@
295321
};
296322
};
297323

324+
&mcu_m4fss {
325+
mboxes = <&mailbox0_cluster0 &mbox_m4_0>;
326+
memory-region = <&mcu_m4fss_dma_memory_region>,
327+
<&mcu_m4fss_memory_region>;
328+
status = "okay";
329+
};
330+
298331
&ospi0 {
299332
pinctrl-names = "default";
300333
pinctrl-0 = <&ospi0_pins_default>;

0 commit comments

Comments
 (0)