Skip to content

Commit 4ca9c20

Browse files
committed
Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next
Batch #2 of next window Signed-off-by: Nishanth Menon <[email protected]>
3 parents cdfb418 + bcbc3d4 + c62bc66 commit 4ca9c20

File tree

4 files changed

+39
-0
lines changed

4 files changed

+39
-0
lines changed

arch/arm64/boot/dts/ti/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm.dtb
129129
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-pcie0-pcie1-ep.dtbo
130130
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-quad-port-eth-exp1.dtbo
131131
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-usxgmii-exp1-exp2.dtbo
132+
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-j742s2-evm-usb0-type-a.dtbo
132133

133134
# Boards with J742S2 SoC
134135
dtb-$(CONFIG_ARCH_K3) += k3-j742s2-evm.dtb
@@ -213,10 +214,14 @@ k3-j721e-sk-csi2-dual-imx219-dtbs := k3-j721e-sk.dtb \
213214
k3-j721e-sk-csi2-dual-imx219.dtbo
214215
k3-j721s2-evm-pcie1-ep-dtbs := k3-j721s2-common-proc-board.dtb \
215216
k3-j721s2-evm-pcie1-ep.dtbo
217+
k3-j742s2-evm-usb0-type-a-dtbs := k3-j742s2-evm.dtb \
218+
k3-j784s4-j742s2-evm-usb0-type-a.dtbo
216219
k3-j784s4-evm-pcie0-pcie1-ep-dtbs := k3-j784s4-evm.dtb \
217220
k3-j784s4-evm-pcie0-pcie1-ep.dtbo
218221
k3-j784s4-evm-quad-port-eth-exp1-dtbs := k3-j784s4-evm.dtb \
219222
k3-j784s4-evm-quad-port-eth-exp1.dtbo
223+
k3-j784s4-evm-usb0-type-a-dtbs := k3-j784s4-evm.dtb \
224+
k3-j784s4-j742s2-evm-usb0-type-a.dtbo
220225
k3-j784s4-evm-usxgmii-exp1-exp2-dtbs := k3-j784s4-evm.dtb \
221226
k3-j784s4-evm-usxgmii-exp1-exp2.dtbo
222227
dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
@@ -247,8 +252,10 @@ dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
247252
k3-j721e-evm-pcie1-ep.dtb \
248253
k3-j721e-sk-csi2-dual-imx219.dtb \
249254
k3-j721s2-evm-pcie1-ep.dtb \
255+
k3-j742s2-evm-usb0-type-a.dtb \
250256
k3-j784s4-evm-pcie0-pcie1-ep.dtb \
251257
k3-j784s4-evm-quad-port-eth-exp1.dtb \
258+
k3-j784s4-evm-usb0-type-a.dtb \
252259
k3-j784s4-evm-usxgmii-exp1-exp2.dtb
253260

254261
# Enable support for device-tree overlays

arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@
309309
};
310310

311311
&main_gpio1 {
312+
bootph-all;
312313
status = "okay";
313314
};
314315

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// SPDX-License-Identifier: GPL-2.0-only OR MIT
2+
/**
3+
* DT Overlay for enabling USB0 instance of USB on J784S4 and J742S2 EVMs for
4+
* Host Mode of operation with the Type-A Connector.
5+
*
6+
* J784S4 EVM Product Link: https://www.ti.com/tool/J784S4XEVM
7+
* J742S2 EVM Product Link: https://www.ti.com/tool/J742S2XH01EVM
8+
*
9+
* Copyright (C) 2025 Texas Instruments Incorporated - https://www.ti.com/
10+
*/
11+
12+
/dts-v1/;
13+
/plugin/;
14+
15+
#include <dt-bindings/gpio/gpio.h>
16+
17+
&exp2 {
18+
p12-hog {
19+
/* P12 - USB2.0_MUX_SEL */
20+
gpio-hog;
21+
gpios = <12 GPIO_ACTIVE_HIGH>;
22+
output-high;
23+
line-name = "USB2.0_MUX_SEL";
24+
};
25+
};
26+
27+
&usb0 {
28+
dr_mode = "host";
29+
};

drivers/soc/ti/k3-socinfo.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#define JTAG_ID_PARTNO_AM62AX 0xBB8D
4444
#define JTAG_ID_PARTNO_AM62PX 0xBB9D
4545
#define JTAG_ID_PARTNO_J722S 0xBBA0
46+
#define JTAG_ID_PARTNO_AM62LX 0xBBA7
4647

4748
static const struct k3_soc_id {
4849
unsigned int id;
@@ -58,6 +59,7 @@ static const struct k3_soc_id {
5859
{ JTAG_ID_PARTNO_AM62AX, "AM62AX" },
5960
{ JTAG_ID_PARTNO_AM62PX, "AM62PX" },
6061
{ JTAG_ID_PARTNO_J722S, "J722S" },
62+
{ JTAG_ID_PARTNO_AM62LX, "AM62LX" },
6163
};
6264

6365
static const char * const j721e_rev_string_map[] = {

0 commit comments

Comments
 (0)