Skip to content

Commit 8d0bcb7

Browse files
zampierilucaszampierilucas
committed
Merge: Pull up TI devicetrees to v6.10
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4548 JIRA: https://issues.redhat.com/browse/RHEL-44742 This pulls up TI's devicetrees to v6.10 (with some v6.11 additions) and pulls in a few clk/phy patches to ensure the newer devicetree works well in our kernel. Signed-off-by: Andrew Halaney <ahalaney@redhat.com> Approved-by: Eric Chanudet <echanude@redhat.com> Approved-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents 980b2ba + 9805e06 commit 8d0bcb7

File tree

125 files changed

+6831
-1526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+6831
-1526
lines changed

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

Lines changed: 70 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: GPL-2.0-only
22
#
33
# Make file to build device tree binaries for boards based on
44
# Texas Instruments Inc processors
@@ -22,6 +22,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dahlia.dtb
2222
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dev.dtb
2323
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-mallow.dtb
2424
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-yavia.dtb
25+
dtb-$(CONFIG_ARCH_K3) += k3-am62x-phyboard-lyra-gpio-fan.dtbo
2526
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb
2627

2728
# Boards with AM62Ax SoC
@@ -37,27 +38,41 @@ dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-csi2-imx219.dtbo
3738
dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-hdmi-audio.dtbo
3839

3940
# Boards with AM64x SoC
41+
k3-am642-hummingboard-t-pcie-dtbs := \
42+
k3-am642-hummingboard-t.dtb k3-am642-hummingboard-t-pcie.dtbo
43+
k3-am642-hummingboard-t-usb3-dtbs := \
44+
k3-am642-hummingboard-t.dtb k3-am642-hummingboard-t-usb3.dtbo
4045
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm.dtb
46+
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac.dtbo
47+
dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t.dtb
48+
dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-pcie.dtb
49+
dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-usb3.dtb
4150
dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-rdk.dtb
51+
dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-gpio-fan.dtbo
4252
dtb-$(CONFIG_ARCH_K3) += k3-am642-sk.dtb
4353
dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl.dtb
4454
dtb-$(CONFIG_ARCH_K3) += k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
4555
dtb-$(CONFIG_ARCH_K3) += k3-am64-tqma64xxl-mbax4xxl-wlan.dtbo
4656

4757
# Boards with AM65x SoC
48-
k3-am654-gp-evm-dtbs := k3-am654-base-board.dtb k3-am654-base-board-rocktech-rk101-panel.dtbo
58+
k3-am654-gp-evm-dtbs := k3-am654-base-board.dtb \
59+
k3-am654-base-board-rocktech-rk101-panel.dtbo \
60+
k3-am654-pcie-usb3.dtbo
4961
k3-am654-evm-dtbs := k3-am654-base-board.dtb k3-am654-icssg2.dtbo
50-
k3-am654-idk-dtbs := k3-am654-evm.dtb k3-am654-idk.dtbo
62+
k3-am654-idk-dtbs := k3-am654-evm.dtb k3-am654-idk.dtbo k3-am654-pcie-usb2.dtbo
5163
dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic.dtb
5264
dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic-pg2.dtb
5365
dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced.dtb
5466
dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-m2.dtb
5567
dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-pg2.dtb
68+
dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-sm.dtb
5669
dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb
5770
dtb-$(CONFIG_ARCH_K3) += k3-am654-gp-evm.dtb
5871
dtb-$(CONFIG_ARCH_K3) += k3-am654-evm.dtb
5972
dtb-$(CONFIG_ARCH_K3) += k3-am654-idk.dtb
6073
dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board-rocktech-rk101-panel.dtbo
74+
dtb-$(CONFIG_ARCH_K3) += k3-am654-pcie-usb2.dtbo
75+
dtb-$(CONFIG_ARCH_K3) += k3-am654-pcie-usb3.dtbo
6176

6277
# Boards with J7200 SoC
6378
k3-j7200-evm-dtbs := k3-j7200-common-proc-board.dtb k3-j7200-evm-quad-port-eth-exp.dtbo
@@ -70,6 +85,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm.dtb
7085
dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm-gesi-exp-board.dtbo
7186
dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm-pcie0-ep.dtbo
7287
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb
88+
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk-csi2-dual-imx219.dtbo
7389

7490
# Boards with J721s2 SoC
7591
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
@@ -79,15 +95,23 @@ k3-j721s2-evm-dtbs := k3-j721s2-common-proc-board.dtb k3-j721s2-evm-gesi-exp-boa
7995
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm.dtb
8096
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-pcie1-ep.dtbo
8197

98+
# Boards with J722s SoC
99+
dtb-$(CONFIG_ARCH_K3) += k3-j722s-evm.dtb
100+
82101
# Boards with J784s4 SoC
83102
dtb-$(CONFIG_ARCH_K3) += k3-am69-sk.dtb
84103
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm.dtb
104+
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-pcie0-pcie1-ep.dtbo
105+
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-quad-port-eth-exp1.dtbo
106+
dtb-$(CONFIG_ARCH_K3) += k3-j784s4-evm-usxgmii-exp1-exp2.dtbo
85107

86108
# Build time test only, enabled by CONFIG_OF_ALL_DTBS
87109
k3-am625-beagleplay-csi2-ov5640-dtbs := k3-am625-beagleplay.dtb \
88110
k3-am625-beagleplay-csi2-ov5640.dtbo
89111
k3-am625-beagleplay-csi2-tevi-ov5640-dtbs := k3-am625-beagleplay.dtb \
90112
k3-am625-beagleplay-csi2-tevi-ov5640.dtbo
113+
k3-am625-phyboard-lyra-gpio-fan-dtbs := k3-am625-phyboard-lyra-rdk.dtb \
114+
k3-am62x-phyboard-lyra-gpio-fan.dtbo
91115
k3-am625-sk-csi2-imx219-dtbs := k3-am625-sk.dtb \
92116
k3-am62x-sk-csi2-imx219.dtbo
93117
k3-am625-sk-csi2-ov5640-dtbs := k3-am625-sk.dtb \
@@ -102,14 +126,37 @@ k3-am62a7-sk-csi2-ov5640-dtbs := k3-am62a7-sk.dtb \
102126
k3-am62x-sk-csi2-ov5640.dtbo
103127
k3-am62a7-sk-csi2-tevi-ov5640-dtbs := k3-am62a7-sk.dtb \
104128
k3-am62x-sk-csi2-tevi-ov5640.dtbo
129+
k3-am62a7-sk-hdmi-audio-dtbs := k3-am62a7-sk.dtb k3-am62x-sk-hdmi-audio.dtbo
130+
k3-am62p5-sk-csi2-imx219-dtbs := k3-am62p5-sk.dtb \
131+
k3-am62x-sk-csi2-imx219.dtbo
132+
k3-am62p5-sk-csi2-ov5640-dtbs := k3-am62p5-sk.dtb \
133+
k3-am62x-sk-csi2-ov5640.dtbo
134+
k3-am62p5-sk-csi2-tevi-ov5640-dtbs := k3-am62p5-sk.dtb \
135+
k3-am62x-sk-csi2-tevi-ov5640.dtbo
136+
k3-am642-evm-icssg1-dualemac-dtbs := \
137+
k3-am642-evm.dtb k3-am642-evm-icssg1-dualemac.dtbo
138+
k3-am642-phyboard-electra-gpio-fan-dtbs := \
139+
k3-am642-phyboard-electra-rdk.dtb k3-am642-phyboard-electra-gpio-fan.dtbo
105140
k3-am642-tqma64xxl-mbax4xxl-sdcard-dtbs := \
106141
k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
107142
k3-am642-tqma64xxl-mbax4xxl-wlan-dtbs := \
108143
k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-wlan.dtbo
144+
k3-am68-sk-base-board-csi2-dual-imx219-dtbs := k3-am68-sk-base-board.dtb \
145+
k3-j721e-sk-csi2-dual-imx219.dtbo
146+
k3-am69-sk-csi2-dual-imx219-dtbs := k3-am69-sk.dtb \
147+
k3-j721e-sk-csi2-dual-imx219.dtbo
109148
k3-j721e-evm-pcie0-ep-dtbs := k3-j721e-common-proc-board.dtb \
110149
k3-j721e-evm-pcie0-ep.dtbo
150+
k3-j721e-sk-csi2-dual-imx219-dtbs := k3-j721e-sk.dtb \
151+
k3-j721e-sk-csi2-dual-imx219.dtbo
111152
k3-j721s2-evm-pcie1-ep-dtbs := k3-j721s2-common-proc-board.dtb \
112153
k3-j721s2-evm-pcie1-ep.dtbo
154+
k3-j784s4-evm-pcie0-pcie1-ep-dtbs := k3-j784s4-evm.dtb \
155+
k3-j784s4-evm-pcie0-pcie1-ep.dtbo
156+
k3-j784s4-evm-quad-port-eth-exp1-dtbs := k3-j784s4-evm.dtb \
157+
k3-j784s4-evm-quad-port-eth-exp1.dtbo
158+
k3-j784s4-evm-usxgmii-exp1-exp2-dtbs := k3-j784s4-evm.dtb \
159+
k3-j784s4-evm-usxgmii-exp1-exp2.dtbo
113160
dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
114161
k3-am625-beagleplay-csi2-tevi-ov5640.dtb \
115162
k3-am625-sk-csi2-imx219.dtb \
@@ -119,17 +166,36 @@ dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
119166
k3-am62-lp-sk-hdmi-audio.dtb \
120167
k3-am62a7-sk-csi2-imx219.dtb \
121168
k3-am62a7-sk-csi2-ov5640.dtb \
169+
k3-am62a7-sk-hdmi-audio.dtb \
170+
k3-am62p5-sk-csi2-imx219.dtb \
171+
k3-am62p5-sk-csi2-ov5640.dtb \
172+
k3-am62p5-sk-csi2-tevi-ov5640.dtb \
173+
k3-am642-evm-icssg1-dualemac.dtb \
122174
k3-am642-tqma64xxl-mbax4xxl-sdcard.dtb \
123175
k3-am642-tqma64xxl-mbax4xxl-wlan.dtb \
176+
k3-am68-sk-base-board-csi2-dual-imx219.dtb \
177+
k3-am69-sk-csi2-dual-imx219.dtb \
124178
k3-j721e-evm-pcie0-ep.dtb \
125-
k3-j721s2-evm-pcie1-ep.dtb
179+
k3-j721e-sk-csi2-dual-imx219.dtb \
180+
k3-j721s2-evm-pcie1-ep.dtb \
181+
k3-j784s4-evm-pcie0-pcie1-ep.dtb \
182+
k3-j784s4-evm-quad-port-eth-exp1.dtb \
183+
k3-j784s4-evm-usxgmii-exp1-exp2.dtb
126184

127185
# Enable support for device-tree overlays
128186
DTC_FLAGS_k3-am625-beagleplay += -@
187+
DTC_FLAGS_k3-am625-phyboard-lyra-rdk += -@
129188
DTC_FLAGS_k3-am625-sk += -@
130189
DTC_FLAGS_k3-am62-lp-sk += -@
131190
DTC_FLAGS_k3-am62a7-sk += -@
191+
DTC_FLAGS_k3-am62p5-sk += -@
192+
DTC_FLAGS_k3-am642-evm += -@
193+
DTC_FLAGS_k3-am642-phyboard-electra-rdk += -@
132194
DTC_FLAGS_k3-am642-tqma64xxl-mbax4xxl += -@
133195
DTC_FLAGS_k3-am6548-iot2050-advanced-m2 += -@
196+
DTC_FLAGS_k3-am68-sk-base-board += -@
197+
DTC_FLAGS_k3-am69-sk += -@
134198
DTC_FLAGS_k3-j721e-common-proc-board += -@
199+
DTC_FLAGS_k3-j721e-sk += -@
135200
DTC_FLAGS_k3-j721s2-common-proc-board += -@
201+
DTC_FLAGS_k3-j784s4-evm += -@

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
// SPDX-License-Identifier: GPL-2.0-only OR MIT
22
/*
33
* AM62x LP SK: https://www.ti.com/tool/SK-AM62-LP
44
*
5-
* Copyright (C) 2021-2023 Texas Instruments Incorporated - https://www.ti.com/
5+
* Copyright (C) 2021-2024 Texas Instruments Incorporated - https://www.ti.com/
66
*/
77

88
/dts-v1/;
@@ -166,7 +166,6 @@
166166

167167
interrupt-parent = <&gic500>;
168168
interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
169-
ti,power-button;
170169

171170
regulators {
172171
buck1_reg: buck1 {

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

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
// SPDX-License-Identifier: GPL-2.0-only OR MIT
22
/*
33
* Device Tree Source for AM625 SoC Family Main Domain peripherals
44
*
5-
* Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com/
5+
* Copyright (C) 2020-2024 Texas Instruments Incorporated - https://www.ti.com/
66
*/
77

88
&cbass_main {
@@ -42,9 +42,8 @@
4242
};
4343
};
4444

45-
main_conf: syscon@100000 {
46-
compatible = "syscon", "simple-mfd";
47-
reg = <0x00 0x00100000 0x00 0x20000>;
45+
main_conf: bus@100000 {
46+
compatible = "simple-bus";
4847
#address-cells = <1>;
4948
#size-cells = <1>;
5049
ranges = <0x0 0x00 0x00100000 0x20000>;
@@ -559,10 +558,9 @@
559558
clock-names = "clk_ahb", "clk_xin";
560559
assigned-clocks = <&k3_clks 57 6>;
561560
assigned-clock-parents = <&k3_clks 57 8>;
561+
bus-width = <8>;
562562
mmc-ddr-1_8v;
563563
mmc-hs200-1_8v;
564-
ti,trm-icp = <0x2>;
565-
bus-width = <8>;
566564
ti,clkbuf-sel = <0x7>;
567565
ti,otap-del-sel-legacy = <0x0>;
568566
ti,otap-del-sel-mmc-hs = <0x0>;
@@ -580,7 +578,8 @@
580578
power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
581579
clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
582580
clock-names = "clk_ahb", "clk_xin";
583-
ti,trm-icp = <0x2>;
581+
bus-width = <4>;
582+
ti,clkbuf-sel = <0x7>;
584583
ti,otap-del-sel-legacy = <0x8>;
585584
ti,otap-del-sel-sd-hs = <0x0>;
586585
ti,otap-del-sel-sdr12 = <0x0>;
@@ -592,8 +591,6 @@
592591
ti,itap-del-sel-sd-hs = <0x1>;
593592
ti,itap-del-sel-sdr12 = <0xa>;
594593
ti,itap-del-sel-sdr25 = <0x1>;
595-
ti,clkbuf-sel = <0x7>;
596-
bus-width = <4>;
597594
status = "disabled";
598595
};
599596

@@ -604,7 +601,8 @@
604601
power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>;
605602
clocks = <&k3_clks 184 5>, <&k3_clks 184 6>;
606603
clock-names = "clk_ahb", "clk_xin";
607-
ti,trm-icp = <0x2>;
604+
bus-width = <4>;
605+
ti,clkbuf-sel = <0x7>;
608606
ti,otap-del-sel-legacy = <0x8>;
609607
ti,otap-del-sel-sd-hs = <0x0>;
610608
ti,otap-del-sel-sdr12 = <0x0>;
@@ -616,16 +614,16 @@
616614
ti,itap-del-sel-sd-hs = <0xa>;
617615
ti,itap-del-sel-sdr12 = <0xa>;
618616
ti,itap-del-sel-sdr25 = <0x1>;
619-
ti,clkbuf-sel = <0x7>;
620617
status = "disabled";
621618
};
622619

623620
usbss0: dwc3-usb@f900000 {
624621
compatible = "ti,am62-usb";
625-
reg = <0x00 0x0f900000 0x00 0x800>;
622+
reg = <0x00 0x0f900000 0x00 0x800>,
623+
<0x00 0x0f908000 0x00 0x400>;
626624
clocks = <&k3_clks 161 3>;
627625
clock-names = "ref";
628-
ti,syscon-phy-pll-refclk = <&wkup_conf 0x4008>;
626+
ti,syscon-phy-pll-refclk = <&usb0_phy_ctrl 0x0>;
629627
#address-cells = <2>;
630628
#size-cells = <2>;
631629
power-domains = <&k3_pds 178 TI_SCI_PD_EXCLUSIVE>;
@@ -647,10 +645,11 @@
647645

648646
usbss1: dwc3-usb@f910000 {
649647
compatible = "ti,am62-usb";
650-
reg = <0x00 0x0f910000 0x00 0x800>;
648+
reg = <0x00 0x0f910000 0x00 0x800>,
649+
<0x00 0x0f918000 0x00 0x400>;
651650
clocks = <&k3_clks 162 3>;
652651
clock-names = "ref";
653-
ti,syscon-phy-pll-refclk = <&wkup_conf 0x4018>;
652+
ti,syscon-phy-pll-refclk = <&usb1_phy_ctrl 0x0>;
654653
#address-cells = <2>;
655654
#size-cells = <2>;
656655
power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
// SPDX-License-Identifier: GPL-2.0-only OR MIT
22
/*
33
* Device Tree Source for AM625 SoC Family MCU Domain peripherals
44
*
5-
* Copyright (C) 2020-2022 Texas Instruments Incorporated - https://www.ti.com/
5+
* Copyright (C) 2020-2024 Texas Instruments Incorporated - https://www.ti.com/
66
*/
77

88
&cbass_mcu {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
// SPDX-License-Identifier: GPL-2.0-only OR MIT
22
/*
3-
* Copyright (C) 2022 - 2023 PHYTEC Messtechnik GmbH
3+
* Copyright (C) 2022-2024 PHYTEC Messtechnik GmbH
44
* Author: Wadim Egorov <w.egorov@phytec.de>
55
*
66
* Product homepage:
@@ -317,7 +317,6 @@
317317
&sdhci0 {
318318
pinctrl-names = "default";
319319
pinctrl-0 = <&main_mmc0_pins_default>;
320-
ti,driver-strength-ohm = <50>;
321320
disable-wp;
322321
non-removable;
323322
status = "okay";

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
// SPDX-License-Identifier: GPL-2.0-only OR MIT
2+
/*
3+
* Copyright (C) 2023-2024 Texas Instruments Incorporated - https://www.ti.com/
4+
*/
25

36
#include <dt-bindings/thermal/thermal.h>
47

0 commit comments

Comments
 (0)