Skip to content

Commit ce48056

Browse files
arndbarndb
committed
Merge tag 'ti-k3-dt-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
TI K3 device tree updates for v6.14 Generic Fixups/Cleanups: - Remove unused and undocumented "ti,(rx|tx)-fifo-depth" properties for ethernet phy - Clock description added to ICSS-G SoC Specific features and Fixes: - Duplicate GICR reg defines in am62x/am62ax - Mailbox nodes are enabled at board level bringing AM67/j722s/am62p to same behavior as other K3 SoCs. - Introduction of deep-sleep state defines for pinctrl header AM62Ax - Enable ti-sysc for wkup_uart0 AM64: - Switch ICSSG clock to core clock. J7200: - Disable SPI1 loopback default. J784s4: - Clock ID fix for McSPI instances - Use j7200-padconf compatibility for padconf to enable suspend-to-ram support. Board Specific: AM62 - phyboard - hdmi bridge regulator and using 16bit input for hdmi bridge, vcc-supply for i2c eeprom - SK - SoC wakeup using USB1, Add bootph property around cpsw mac syscon node, M4 mailbox node redefinition fixup. - BeaglePlay: Fix ethernet phy reset time AM64 - hummingboard-t: Convert PCIE/USB overlays to independent dts. j7200: - EVM: fix typo in overlay name. j721e: - EVM: overlay for pcie1 endpoint mode. j722s: - EVM: Add mcu_i2c0 support for expansion pins., Add USB0 DFU support, Enable PMIC - AM67a-beagley-ai: Add remote proc nodes j784s4: - AM69-SK/ j784s4-EVM - Mark PMIC regulators with bootph-all property to indicate ones that are needed through boot phases. - AM69-sk: PIC0 Endpoint mode overlay, USB Superspeed mode. * tag 'ti-k3-dt-for-v6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (31 commits) arm64: dts: ti: k3-am62a-wakeup: Configure ti-sysc for wkup_uart0 arm64: dts: ti: k3-j722s-evm: Enable PMIC arm64: dts: ti: k3-am69-sk: Add USB SuperSpeed support arm64: dts: ti: k3-am625-beagleplay: Fix DP83TD510E reset time arm64: dts: ti: k3-am642-hummingboard-t: Convert overlay to board dts arm64: dts: ti: k3-am69-sk: Add overlay for PCIE0 Endpoint Mode arm64: dts: ti: k3-am68-sk-base-board: Add overlay for PCIE1 Endpoint Mode arm64: dts: ti: k3-j721e-evm: Add overlay for PCIE1 Endpoint Mode arm64: dts: ti: Makefile: Fix typo "k3-j7200-evm-pcie1-ep.dtbo" arm64: dts: ti: k3-j7200: Add node to disable loopback connection arm64: dts: ti: k3-j784s4: Use ti,j7200-padconf compatible arm64: dts: ti: k3-am62p-j722s-common-main: Enable USB0 for DFU boot arm64: dts: ti: k3-am62a: Remove duplicate GICR reg arm64: dts: ti: k3-am62: Remove duplicate GICR reg arm64: dts: ti: k3-am67a-beagley-ai: Add remote processor nodes arm64: dts: ti: k3-am62p: Enable Mailbox nodes at the board level arm64: dts: ti: k3-am625-sk: Remove M4 mailbox node redefinition arm64: dts: ti: k3-j722s-evm: Enable support for mcu_i2c0 arm64: dts: ti: k3-am62x-sk-common: Add bootph-all property in cpsw_mac_syscon node arm64: dts: ti: Remove unused and undocumented "ti,(rx|tx)-fifo-depth" properties ... Link: https://lore.kernel.org/r/20250110210812.bdpypzvmg6s6sr5t@itinerary Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 73ac18d + 5532b8a commit ce48056

28 files changed

+654
-59
lines changed

‎Documentation/devicetree/bindings/soc/ti/ti,pruss.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,16 @@ properties:
9292
description: |
9393
This property is as per sci-pm-domain.txt.
9494
95+
clocks:
96+
items:
97+
- description: ICSSG_CORE Clock
98+
- description: ICSSG_IEP Clock
99+
- description: ICSSG_RGMII_MHZ_250 Clock
100+
- description: ICSSG_RGMII_MHZ_50 Clock
101+
- description: ICSSG_RGMII_MHZ_5 Clock
102+
- description: ICSSG_UART Clock
103+
- description: ICSSG_ICLK Clock
104+
95105
patternProperties:
96106

97107
memories@[a-f0-9]+$:

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-csi2-imx219.dtbo
4242
dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-hdmi-audio.dtbo
4343

4444
# Boards with AM64x SoC
45-
k3-am642-hummingboard-t-pcie-dtbs := \
46-
k3-am642-hummingboard-t.dtb k3-am642-hummingboard-t-pcie.dtbo
47-
k3-am642-hummingboard-t-usb3-dtbs := \
48-
k3-am642-hummingboard-t.dtb k3-am642-hummingboard-t-usb3.dtbo
4945
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm.dtb
5046
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac.dtbo
5147
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac-mii.dtbo
@@ -107,11 +103,13 @@ dtb-$(CONFIG_ARCH_K3) += k3-j721e-common-proc-board-infotainment.dtbo
107103
dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm.dtb
108104
dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm-gesi-exp-board.dtbo
109105
dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm-pcie0-ep.dtbo
106+
dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm-pcie1-ep.dtbo
110107
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb
111108
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk-csi2-dual-imx219.dtbo
112109

113110
# Boards with J721s2 SoC
114111
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
112+
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board-pcie1-ep.dtbo
115113
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb
116114
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-gesi-exp-board.dtbo
117115
k3-j721s2-evm-dtbs := k3-j721s2-common-proc-board.dtb k3-j721s2-evm-gesi-exp-board.dtbo
@@ -124,6 +122,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-j722s-evm.dtb
124122

125123
# Boards with J784s4 SoC
126124
dtb-$(CONFIG_ARCH_K3) += k3-am69-sk.dtb
125+
dtb-$(CONFIG_ARCH_K3) += k3-am69-sk-pcie0-ep.dtbo
127126
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm.dtb
128127
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-pcie0-pcie1-ep.dtbo
129128
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-quad-port-eth-exp1.dtbo
@@ -192,14 +191,20 @@ k3-am642-tqma64xxl-mbax4xxl-wlan-dtbs := \
192191
k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-wlan.dtbo
193192
k3-am68-sk-base-board-csi2-dual-imx219-dtbs := k3-am68-sk-base-board.dtb \
194193
k3-j721e-sk-csi2-dual-imx219.dtbo
194+
k3-am68-sk-base-board-pcie1-ep-dtbs := k3-am68-sk-base-board.dtb \
195+
k3-am68-sk-base-board-pcie1-ep.dtbo
195196
k3-am69-sk-csi2-dual-imx219-dtbs := k3-am69-sk.dtb \
196197
k3-j721e-sk-csi2-dual-imx219.dtbo
198+
k3-am69-sk-pcie0-ep-dtbs := k3-am69-sk.dtb \
199+
k3-am69-sk-pcie0-ep.dtbo
197200
k3-j7200-evm-pcie1-ep-dtbs := k3-j7200-common-proc-board.dtb \
198201
k3-j7200-evm-pcie1-ep.dtbo
199202
k3-j721e-common-proc-board-infotainment-dtbs := k3-j721e-common-proc-board.dtb \
200203
k3-j721e-common-proc-board-infotainment.dtbo
201204
k3-j721e-evm-pcie0-ep-dtbs := k3-j721e-common-proc-board.dtb \
202205
k3-j721e-evm-pcie0-ep.dtbo
206+
k3-j721e-evm-pcie1-ep-dtbs := k3-j721e-common-proc-board.dtb \
207+
k3-j721e-evm-pcie1-ep.dtbo
203208
k3-j721e-sk-csi2-dual-imx219-dtbs := k3-j721e-sk.dtb \
204209
k3-j721e-sk-csi2-dual-imx219.dtbo
205210
k3-j721s2-evm-pcie1-ep-dtbs := k3-j721s2-common-proc-board.dtb \
@@ -229,10 +234,13 @@ dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
229234
k3-am642-tqma64xxl-mbax4xxl-sdcard.dtb \
230235
k3-am642-tqma64xxl-mbax4xxl-wlan.dtb \
231236
k3-am68-sk-base-board-csi2-dual-imx219.dtb \
237+
k3-am68-sk-base-board-pcie1-ep.dtb \
232238
k3-am69-sk-csi2-dual-imx219.dtb \
233-
k3-j7200-evm-pcie1-ep.dtbo \
239+
k3-am69-sk-pcie0-ep.dtb \
240+
k3-j7200-evm-pcie1-ep.dtb \
234241
k3-j721e-common-proc-board-infotainment.dtb \
235242
k3-j721e-evm-pcie0-ep.dtb \
243+
k3-j721e-evm-pcie1-ep.dtb \
236244
k3-j721e-sk-csi2-dual-imx219.dtb \
237245
k3-j721s2-evm-pcie1-ep.dtb \
238246
k3-j784s4-evm-pcie0-pcie1-ep.dtb \
@@ -255,6 +263,7 @@ DTC_FLAGS_k3-am68-sk-base-board += -@
255263
DTC_FLAGS_k3-am69-sk += -@
256264
DTC_FLAGS_k3-j7200-common-proc-board += -@
257265
DTC_FLAGS_k3-j721e-common-proc-board += -@
266+
DTC_FLAGS_k3-j721e-evm-pcie0-ep += -@
258267
DTC_FLAGS_k3-j721e-sk += -@
259268
DTC_FLAGS_k3-j721s2-common-proc-board += -@
260269
DTC_FLAGS_k3-j784s4-evm += -@

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
interrupt-controller;
2424
reg = <0x00 0x01800000 0x00 0x10000>, /* GICD */
2525
<0x00 0x01880000 0x00 0xc0000>, /* GICR */
26-
<0x00 0x01880000 0x00 0xc0000>, /* GICR */
2726
<0x01 0x00000000 0x00 0x2000>, /* GICC */
2827
<0x01 0x00010000 0x00 0x1000>, /* GICH */
2928
<0x01 0x00020000 0x00 0x2000>; /* GICV */

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,16 @@
9595
regulator-boot-on;
9696
};
9797

98+
vddshv_3v3: regulator-vddshv-3v3 {
99+
compatible = "regulator-fixed";
100+
regulator-name = "VDDSHV0";
101+
regulator-min-microvolt = <3300000>;
102+
regulator-max-microvolt = <3300000>;
103+
vin-supply = <&vdd_3v3>;
104+
regulator-always-on;
105+
regulator-boot-on;
106+
};
107+
98108
leds {
99109
compatible = "gpio-leds";
100110
pinctrl-names = "default";
@@ -313,6 +323,7 @@
313323
compatible = "atmel,24c32";
314324
pagesize = <32>;
315325
reg = <0x50>;
326+
vcc-supply = <&vddshv_3v3>;
316327
};
317328

318329
i2c_som_rtc: rtc@52 {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@
610610
reg = <1>;
611611
reset-gpios = <&main_gpio1 5 GPIO_ACTIVE_LOW>;
612612
reset-assert-us = <25>;
613-
reset-deassert-us = <60000>; /* T2 */
613+
reset-deassert-us = <35>;
614614
};
615615
};
616616

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,6 @@
219219
};
220220
};
221221

222-
&mailbox0_cluster0 {
223-
mbox_m4_0: mbox-m4-0 {
224-
ti,mbox-rx = <0 0 0>;
225-
ti,mbox-tx = <1 0 0>;
226-
};
227-
};
228-
229222
&fss {
230223
bootph-all;
231224
};

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
compatible = "arm,gic-v3";
1919
reg = <0x00 0x01800000 0x00 0x10000>, /* GICD */
2020
<0x00 0x01880000 0x00 0xc0000>, /* GICR */
21-
<0x00 0x01880000 0x00 0xc0000>, /* GICR */
2221
<0x01 0x00000000 0x00 0x2000>, /* GICC */
2322
<0x01 0x00010000 0x00 0x1000>, /* GICH */
2423
<0x01 0x00020000 0x00 0x2000>; /* GICV */

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

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
/*
33
* Device Tree Source for AM62A SoC Family Wakeup Domain peripherals
44
*
5-
* Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/
5+
* Copyright (C) 2022-2025 Texas Instruments Incorporated - https://www.ti.com/
66
*/
77

8+
#include <dt-bindings/bus/ti-sysc.h>
9+
810
&cbass_wakeup {
911
wkup_conf: bus@43000000 {
1012
compatible = "simple-bus";
@@ -38,14 +40,34 @@
3840
};
3941
};
4042

41-
wkup_uart0: serial@2b300000 {
42-
compatible = "ti,am64-uart", "ti,am654-uart";
43-
reg = <0x00 0x2b300000 0x00 0x100>;
44-
interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
43+
target-module@2b300050 {
44+
compatible = "ti,sysc-omap2", "ti,sysc";
45+
reg = <0 0x2b300050 0 0x4>,
46+
<0 0x2b300054 0 0x4>,
47+
<0 0x2b300058 0 0x4>;
48+
reg-names = "rev", "sysc", "syss";
49+
ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP |
50+
SYSC_OMAP2_SOFTRESET |
51+
SYSC_OMAP2_AUTOIDLE)>;
52+
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
53+
<SYSC_IDLE_NO>,
54+
<SYSC_IDLE_SMART>,
55+
<SYSC_IDLE_SMART_WKUP>;
56+
ti,syss-mask = <1>;
57+
ti,no-reset-on-init;
4558
power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>;
4659
clocks = <&k3_clks 114 0>;
47-
clock-names = "fclk";
48-
status = "disabled";
60+
clock-names = "fck";
61+
#address-cells = <1>;
62+
#size-cells = <1>;
63+
ranges = <0 0 0x2b300000 0x100000>;
64+
65+
wkup_uart0: serial@0 {
66+
compatible = "ti,am64-uart", "ti,am654-uart";
67+
reg = <0 0x100>;
68+
interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
69+
status = "disabled";
70+
};
4971
};
5072

5173
wkup_i2c0: i2c@2b200000 {

‎arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,7 @@
651651
interrupt-names = "host", "peripheral";
652652
maximum-speed = "high-speed";
653653
dr_mode = "otg";
654+
bootph-all;
654655
snps,usb2-gadget-lpm-disable;
655656
snps,usb2-lpm-disable;
656657
};
@@ -768,6 +769,7 @@
768769
#mbox-cells = <1>;
769770
ti,mbox-num-users = <4>;
770771
ti,mbox-num-fifos = <16>;
772+
status = "disabled";
771773
};
772774

773775
mailbox0_cluster1: mailbox@29010000 {
@@ -777,6 +779,7 @@
777779
#mbox-cells = <1>;
778780
ti,mbox-num-users = <4>;
779781
ti,mbox-num-fifos = <16>;
782+
status = "disabled";
780783
};
781784

782785
mailbox0_cluster2: mailbox@29020000 {
@@ -786,6 +789,7 @@
786789
#mbox-cells = <1>;
787790
ti,mbox-num-users = <4>;
788791
ti,mbox-num-fifos = <16>;
792+
status = "disabled";
789793
};
790794

791795
mailbox0_cluster3: mailbox@29030000 {
@@ -795,6 +799,7 @@
795799
#mbox-cells = <1>;
796800
ti,mbox-num-users = <4>;
797801
ti,mbox-num-fifos = <16>;
802+
status = "disabled";
798803
};
799804

800805
ecap0: pwm@23100000 {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,13 +621,17 @@
621621
};
622622

623623
&mailbox0_cluster0 {
624+
status = "okay";
625+
624626
mbox_r5_0: mbox-r5-0 {
625627
ti,mbox-rx = <0 0 0>;
626628
ti,mbox-tx = <1 0 0>;
627629
};
628630
};
629631

630632
&mailbox0_cluster1 {
633+
status = "okay";
634+
631635
mbox_mcu_r5_0: mbox-mcu-r5-0 {
632636
ti,mbox-rx = <0 0 0>;
633637
ti,mbox-tx = <1 0 0>;

0 commit comments

Comments
 (0)