Skip to content

Commit c522d00

Browse files
arndbarndb
committed
Merge tag 'ti-k3-dt-for-v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
TI K3 device tree updates for v6.17 Generic fixes and cleanups: * Enable overlays for all DTB files * Enable Schmitt Trigger by default in K3 pinctrl SoC specific changes: AM62D * Add new SoC support and pinctrl entries AM62 * Remove eMMC High Speed DDR support * Move eMMC pinmux to top level board file J784S4/J742S2 * Add Power on BIST (PBSIT) nodes * Add ACSPCIE1 node J721S2 * Add McASP support J722S * Add alernate audio-refclk0 node Board changes: Multiple boards * Bootphase tags for Ethernet boot support AM62D2-EVM * Add new board support AM62A7-SK * Fix pinmux for main_uart1 * Add SPI NAND support AM62P * Fix PWM_3_DSI GPIO direction, SD pull up, I2C ups on AM62P-Verdin * Add bootph-all property for Ethernet boot AM62-Verdin * Enable pull-ups on I2C buses AM654-base-board * Add boot phase tags for various bootmodes AM64 * Add boot phase tag PCIe EP boot * Fix PRU-ICSSG Ethernet ports on AM642-PhyBoard-Electra AM69-SK * Add idle-states for remaining SERDES instances J722S-EVM * Fix USB gpio-hog level for Type-C * tag 'ti-k3-dt-for-v6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (33 commits) arm64: dts: ti: k3-am69-sk: Add idle-states for remaining SERDES instances arm64: dts: ti: k3-am62a7-sk: add boot phase tags arm64: dts: ti: k3-am654-base-board: add boot phase tags arm64: dts: ti: k3-am65: add boot phase tags arm64: dts: ti: k3-am69-sk: Add bootph-all property to enable Ethernet boot arm64: dts: ti: k3-j722s-evm: Add bootph-all property to enable Ethernet boot arm64: dts: ti: k3-am62p5-sk: Add bootph-all property to enable Ethernet boot arm64: dts: ti: k3-am68-sk-base-board: Add bootph-all property to enable Ethernet boot arm64: dts: ti: Add support for AM62D2-EVM arm64: dts: ti: Add pinctrl entries for AM62D2 family of SoCs dt-bindings: arm: ti: Add AM62D2 SoC and Boards arm64: dts: ti: Add bootph property to nodes at source for am62a arm64: dts: ti: k3-am62p-verdin: Adjust temperature trip points arm64: dts: ti: k3-am62p-j722s: Enable freq throttling on thermal alert arm64: dts: ti: k3-j784s4-j742s2-main-common: Add PBIST_14 node dt-bindings: soc: ti: bist: Add BIST for K3 devices arm64: dts: ti: k3-am62-main: Remove eMMC High Speed DDR support arm64: dts: ti: k3-am62*: Move eMMC pinmux to top level board file arm64: dts: ti: k3-am62a7-sk: fix pinmux for main_uart1 arm64: dts: ti: Enable overlays for all DTB files ... Link: https://lore.kernel.org/r/a0401460-8c67-4c29-a6cf-fa4bdf33bc7d@ti.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 7824d9e + 974e6cf commit c522d00

33 files changed

Lines changed: 1138 additions & 65 deletions

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

Lines changed: 6 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 AM62D2 SoC and Boards
29+
items:
30+
- enum:
31+
- ti,am62d2-evm
32+
- const: ti,am62d2
33+
2834
- description: K3 AM62A7 SoC PHYTEC phyBOARD-Lyra
2935
items:
3036
- const: phytec,am62a7-phyboard-lyra-rdk

‎Documentation/devicetree/bindings/soc/ti/ti,j784s4-bist.yaml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (C) 2025 Texas Instruments Incorporated
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/soc/ti/ti,j784s4-bist.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Texas Instruments K3 BIST
9+
10+
maintainers:
11+
- Neha Malcom Francis <n-francis@ti.com>
12+
13+
allOf:
14+
- $ref: /schemas/arm/keystone/ti,k3-sci-common.yaml#
15+
16+
description:
17+
The BIST (Built-In Self Test) module is an IP block present in K3 devices
18+
that support triggering of BIST tests, both PBIST (Memory BIST) and LBIST
19+
(Logic BIST) on a core. Both tests are destructive in nature. At boot, BIST
20+
is executed by hardware for the MCU domain automatically as part of HW POST.
21+
22+
properties:
23+
compatible:
24+
const: ti,j784s4-bist
25+
26+
reg:
27+
maxItems: 2
28+
29+
reg-names:
30+
items:
31+
- const: cfg
32+
- const: ctrl_mmr
33+
34+
clocks:
35+
maxItems: 1
36+
37+
power-domains:
38+
maxItems: 1
39+
40+
required:
41+
- compatible
42+
- reg
43+
- reg-names
44+
- ti,sci-dev-id
45+
46+
unevaluatedProperties: false
47+
48+
examples:
49+
- |
50+
#include <dt-bindings/soc/ti,sci_pm_domain.h>
51+
bus {
52+
#address-cells = <2>;
53+
#size-cells = <2>;
54+
safety-selftest@33c0000 {
55+
compatible = "ti,j784s4-bist";
56+
reg = <0x00 0x033c0000 0x00 0x400>,
57+
<0x00 0x0010c1a0 0x00 0x01c>;
58+
reg-names = "cfg", "ctrl_mmr";
59+
clocks = <&k3_clks 237 7>;
60+
power-domains = <&k3_pds 237 TI_SCI_PD_EXCLUSIVE>;
61+
ti,sci-dev-id = <234>;
62+
};
63+
};

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

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ dtb-$(CONFIG_ARCH_K3) += k3-am62-pocketbeagle2.dtb
3333
dtb-$(CONFIG_ARCH_K3) += k3-am62a7-sk.dtb
3434
dtb-$(CONFIG_ARCH_K3) += k3-am62a7-phyboard-lyra-rdk.dtb
3535

36+
# Boards with AM62Dx SoC
37+
dtb-$(CONFIG_ARCH_K3) += k3-am62d2-evm.dtb
38+
3639
# Boards with AM62Px SoC
3740
dtb-$(CONFIG_ARCH_K3) += k3-am62p5-sk.dtb
3841
dtb-$(CONFIG_ARCH_K3) += k3-am62p5-verdin-nonwifi-dahlia.dtb
@@ -278,24 +281,4 @@ dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
278281
k3-j784s4-evm-usxgmii-exp1-exp2.dtb
279282

280283
# Enable support for device-tree overlays
281-
DTC_FLAGS_k3-am625-beagleplay += -@
282-
DTC_FLAGS_k3-am625-phyboard-lyra-rdk += -@
283-
DTC_FLAGS_k3-am62a7-phyboard-lyra-rdk += -@
284-
DTC_FLAGS_k3-am625-sk += -@
285-
DTC_FLAGS_k3-am62-lp-sk += -@
286-
DTC_FLAGS_k3-am62a7-sk += -@
287-
DTC_FLAGS_k3-am62p5-sk += -@
288-
DTC_FLAGS_k3-am642-evm += -@
289-
DTC_FLAGS_k3-am642-phyboard-electra-rdk += -@
290-
DTC_FLAGS_k3-am642-tqma64xxl-mbax4xxl += -@
291-
DTC_FLAGS_k3-am6548-iot2050-advanced-m2 += -@
292-
DTC_FLAGS_k3-am68-sk-base-board += -@
293-
DTC_FLAGS_k3-am69-sk += -@
294-
DTC_FLAGS_k3-j7200-common-proc-board += -@
295-
DTC_FLAGS_k3-j721e-common-proc-board += -@
296-
DTC_FLAGS_k3-j721e-evm-pcie0-ep += -@
297-
DTC_FLAGS_k3-j721e-sk += -@
298-
DTC_FLAGS_k3-j721s2-common-proc-board += -@
299-
DTC_FLAGS_k3-j722s-evm += -@
300-
DTC_FLAGS_k3-j784s4-evm += -@
301-
DTC_FLAGS_k3-j742s2-evm += -@
284+
DTC_FLAGS := -@

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,22 @@
7474
};
7575

7676
&main_pmx0 {
77+
main_mmc0_pins_default: main-mmc0-default-pins {
78+
bootph-all;
79+
pinctrl-single,pins = <
80+
AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (V3) MMC0_CMD */
81+
AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (Y1) MMC0_CLK */
82+
AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (V2) MMC0_DAT0 */
83+
AM62X_IOPAD(0x210, PIN_INPUT, 0) /* (V1) MMC0_DAT1 */
84+
AM62X_IOPAD(0x20c, PIN_INPUT, 0) /* (W2) MMC0_DAT2 */
85+
AM62X_IOPAD(0x208, PIN_INPUT, 0) /* (W1) MMC0_DAT3 */
86+
AM62X_IOPAD(0x204, PIN_INPUT, 0) /* (Y2) MMC0_DAT4 */
87+
AM62X_IOPAD(0x200, PIN_INPUT, 0) /* (W3) MMC0_DAT5 */
88+
AM62X_IOPAD(0x1fc, PIN_INPUT, 0) /* (W4) MMC0_DAT6 */
89+
AM62X_IOPAD(0x1f8, PIN_INPUT, 0) /* (V4) MMC0_DAT7 */
90+
>;
91+
};
92+
7793
vddshv_sdio_pins_default: vddshv-sdio-default-pins {
7894
pinctrl-single,pins = <
7995
AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */
@@ -144,6 +160,14 @@
144160
};
145161
};
146162

163+
&sdhci0 {
164+
bootph-all;
165+
non-removable;
166+
pinctrl-names = "default";
167+
pinctrl-0 = <&main_mmc0_pins_default>;
168+
status = "okay";
169+
};
170+
147171
&sdhci1 {
148172
vmmc-supply = <&vdd_mmc1>;
149173
vqmmc-supply = <&vddshv_sdio>;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,6 @@
553553
clocks = <&k3_clks 57 5>, <&k3_clks 57 6>;
554554
clock-names = "clk_ahb", "clk_xin";
555555
bus-width = <8>;
556-
mmc-ddr-1_8v;
557556
mmc-hs200-1_8v;
558557
ti,clkbuf-sel = <0x7>;
559558
ti,otap-del-sel-legacy = <0x0>;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -507,16 +507,16 @@
507507
/* Verdin I2C_2_DSI */
508508
pinctrl_i2c2: main-i2c2-default-pins {
509509
pinctrl-single,pins = <
510-
AM62X_IOPAD(0x00b0, PIN_INPUT, 1) /* (K22) GPMC0_CSn2.I2C2_SCL */ /* SODIMM 55 */
511-
AM62X_IOPAD(0x00b4, PIN_INPUT, 1) /* (K24) GPMC0_CSn3.I2C2_SDA */ /* SODIMM 53 */
510+
AM62X_IOPAD(0x00b0, PIN_INPUT_PULLUP, 1) /* (K22) GPMC0_CSn2.I2C2_SCL */ /* SODIMM 55 */
511+
AM62X_IOPAD(0x00b4, PIN_INPUT_PULLUP, 1) /* (K24) GPMC0_CSn3.I2C2_SDA */ /* SODIMM 53 */
512512
>;
513513
};
514514

515515
/* Verdin I2C_4_CSI */
516516
pinctrl_i2c3: main-i2c3-default-pins {
517517
pinctrl-single,pins = <
518-
AM62X_IOPAD(0x01d0, PIN_INPUT, 2) /* (A15) UART0_CTSn.I2C3_SCL */ /* SODIMM 95 */
519-
AM62X_IOPAD(0x01d4, PIN_INPUT, 2) /* (B15) UART0_RTSn.I2C3_SDA */ /* SODIMM 93 */
518+
AM62X_IOPAD(0x01d0, PIN_INPUT_PULLUP, 2) /* (A15) UART0_CTSn.I2C3_SCL */ /* SODIMM 95 */
519+
AM62X_IOPAD(0x01d4, PIN_INPUT_PULLUP, 2) /* (B15) UART0_RTSn.I2C3_SDA */ /* SODIMM 93 */
520520
>;
521521
};
522522

@@ -786,8 +786,8 @@
786786
/* Verdin I2C_3_HDMI */
787787
pinctrl_mcu_i2c0: mcu-i2c0-default-pins {
788788
pinctrl-single,pins = <
789-
AM62X_MCU_IOPAD(0x0044, PIN_INPUT, 0) /* (A8) MCU_I2C0_SCL */ /* SODIMM 59 */
790-
AM62X_MCU_IOPAD(0x0048, PIN_INPUT, 0) /* (D10) MCU_I2C0_SDA */ /* SODIMM 57 */
789+
AM62X_MCU_IOPAD(0x0044, PIN_INPUT_PULLUP, 0) /* (A8) MCU_I2C0_SCL */ /* SODIMM 59 */
790+
AM62X_MCU_IOPAD(0x0048, PIN_INPUT_PULLUP, 0) /* (D10) MCU_I2C0_SDA */ /* SODIMM 57 */
791791
>;
792792
};
793793

‎arch/arm64/boot/dts/ti/k3-am625-sk.dts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,22 @@
106106
};
107107

108108
&main_pmx0 {
109+
main_mmc0_pins_default: main-mmc0-default-pins {
110+
bootph-all;
111+
pinctrl-single,pins = <
112+
AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (Y3) MMC0_CMD */
113+
AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (AB1) MMC0_CLK */
114+
AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (AA2) MMC0_DAT0 */
115+
AM62X_IOPAD(0x210, PIN_INPUT_PULLUP, 0) /* (AA1) MMC0_DAT1 */
116+
AM62X_IOPAD(0x20c, PIN_INPUT_PULLUP, 0) /* (AA3) MMC0_DAT2 */
117+
AM62X_IOPAD(0x208, PIN_INPUT_PULLUP, 0) /* (Y4) MMC0_DAT3 */
118+
AM62X_IOPAD(0x204, PIN_INPUT_PULLUP, 0) /* (AB2) MMC0_DAT4 */
119+
AM62X_IOPAD(0x200, PIN_INPUT_PULLUP, 0) /* (AC1) MMC0_DAT5 */
120+
AM62X_IOPAD(0x1fc, PIN_INPUT_PULLUP, 0) /* (AD2) MMC0_DAT6 */
121+
AM62X_IOPAD(0x1f8, PIN_INPUT_PULLUP, 0) /* (AC2) MMC0_DAT7 */
122+
>;
123+
};
124+
109125
main_rgmii2_pins_default: main-rgmii2-default-pins {
110126
bootph-all;
111127
pinctrl-single,pins = <
@@ -195,6 +211,14 @@
195211
};
196212
};
197213

214+
&sdhci0 {
215+
bootph-all;
216+
non-removable;
217+
pinctrl-names = "default";
218+
pinctrl-0 = <&main_mmc0_pins_default>;
219+
status = "okay";
220+
};
221+
198222
&sdhci1 {
199223
vmmc-supply = <&vdd_mmc1>;
200224
vqmmc-supply = <&vdd_sd_dv>;

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
compatible = "ti,am654-phy-gmii-sel";
5252
reg = <0x4044 0x8>;
5353
#phy-cells = <1>;
54+
bootph-all;
5455
};
5556

5657
epwm_tbclk: clock-controller@4130 {
@@ -96,6 +97,7 @@
9697
#mbox-cells = <1>;
9798
interrupt-names = "rx_012";
9899
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
100+
bootph-all;
99101
};
100102

101103
inta_main_dmss: interrupt-controller@48000000 {
@@ -131,6 +133,7 @@
131133
ti,sci-rm-range-bchan = <0x20>; /* BLOCK_COPY_CHAN */
132134
ti,sci-rm-range-rchan = <0x21>; /* SPLIT_TR_RX_CHAN */
133135
ti,sci-rm-range-tchan = <0x22>; /* SPLIT_TR_TX_CHAN */
136+
bootph-all;
134137
};
135138

136139
main_pktdma: dma-controller@485c0000 {
@@ -147,6 +150,8 @@
147150
"ring", "tchan", "rchan", "rflow";
148151
msi-parent = <&inta_main_dmss>;
149152
#dma-cells = <2>;
153+
bootph-all;
154+
150155
ti,sci = <&dmsc>;
151156
ti,sci-dev-id = <30>;
152157
ti,sci-rm-range-tchan = <0x23>, /* UNMAPPED_TX_CHAN */
@@ -220,16 +225,19 @@
220225
k3_pds: power-controller {
221226
compatible = "ti,sci-pm-domain";
222227
#power-domain-cells = <2>;
228+
bootph-all;
223229
};
224230

225231
k3_clks: clock-controller {
226232
compatible = "ti,k2g-sci-clk";
227233
#clock-cells = <2>;
234+
bootph-all;
228235
};
229236

230237
k3_reset: reset-controller {
231238
compatible = "ti,sci-reset";
232239
#reset-cells = <2>;
240+
bootph-all;
233241
};
234242
};
235243

@@ -254,6 +262,7 @@
254262
* firmware on non-MPU processors
255263
*/
256264
status = "disabled";
265+
bootph-all;
257266
};
258267

259268
main_pmx0: pinctrl@f4000 {
@@ -282,6 +291,7 @@
282291
assigned-clock-parents = <&k3_clks 36 3>;
283292
power-domains = <&k3_pds 36 TI_SCI_PD_EXCLUSIVE>;
284293
ti,timer-pwm;
294+
bootph-all;
285295
};
286296

287297
main_timer1: timer@2410000 {
@@ -651,6 +661,7 @@
651661
interrupt-names = "host", "peripheral";
652662
maximum-speed = "high-speed";
653663
dr_mode = "otg";
664+
bootph-all;
654665
snps,usb2-gadget-lpm-disable;
655666
snps,usb2-lpm-disable;
656667
};
@@ -745,6 +756,7 @@
745756
phys = <&phy_gmii_sel 1>;
746757
mac-address = [00 00 00 00 00 00];
747758
ti,syscon-efuse = <&cpsw_mac_syscon 0x0>;
759+
bootph-all;
748760
};
749761

750762
cpsw_port2: port@2 {
@@ -764,6 +776,7 @@
764776
clocks = <&k3_clks 13 0>;
765777
clock-names = "fck";
766778
bus_freq = <1000000>;
779+
bootph-all;
767780
};
768781

769782
cpts@3d000 {

‎arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
chipid: chipid@14 {
1818
compatible = "ti,am654-chipid";
1919
reg = <0x14 0x4>;
20+
bootph-all;
2021
};
2122

2223
opp_efuse_table: syscon@18 {
@@ -67,6 +68,7 @@
6768
reg = <0 0x100>;
6869
interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
6970
status = "disabled";
71+
bootph-pre-ram;
7072
};
7173
};
7274

0 commit comments

Comments
 (0)