Skip to content

Commit d10ee71

Browse files
arndbarndb
committed
Merge tag 'ti-k3-dt-for-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
TI K3 device tree updates for v6.10 Generic Cleanups/Fixes: - fixup of generated dtb imx219 overlay file names - Remove UART baud rate selection in device tree. - Use exact ranges for FSS. SoC specific Fixes/Features: AM625: - Add USB PHY2 region and usb phy control registers AM62A - Add USB PHY2 region and usb phy control registers, Disable USB LPM. - Add wave-512 video encoder/decoder support - Enable UHS mode for SD AM62P: - Disable ethernet by default - Add USB support AM654 - Serdes fixups - SDHCI fixups. AM67/j722s: - Disable ethernet by default - Add USB support AM68/J721s2: - Add main ESM range - Add support for SDR104 AM69/J784S4: - Add main ESM range - Enable support for UHS mode Board specific fixes/Features: AM625: - BeaglePlay: Fixes for wlan mmc-pwrseq and ethernet phy reset - phyboard-lyra: Add Audio codec, USB-C, increase CAN bit rate and enable ability to apply overlays - verdin: GPIO pinctrl fixups, Switch SD carddetect to GPIO, fixup memory to 2GB, and audio clock, PCIe reset GPIO hog, sleep-moci - lp-sk: Drop power button - sk: minor white space cleanup. AM64 - phyboard-electra: Increase CAN bit rate, enable overlay to enable GPIO fan AM65: - iot2050: Add icssg-prueth for PG1 AM67/j722s: - evm: Enable UHS support for SD card and eMMC support. AM69/J784s4: - evm/sk: Fix uart pins and pinctrl macro usage. * tag 'ti-k3-dt-for-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (48 commits) arm64: dts: ti: Fix csi2-dual-imx219 dtb names arm64: dts: ti: k3-am625-beagleplay: Fix Ethernet PHY RESET GPIOs arm64: dts: ti: k3-am625-phyboard-lyra-rdk: Add USB-C arm64: dts: ti: k3-j784s4: Add main esm address range arm64: dts: ti: k3-j721s2: Add main esm address range arm64: dts: ti: k3-am62-verdin-dahlia: support sleep-moci arm64: dts: ti: k3-am62-verdin: replace sleep-moci hog with regulator arm64: dts: ti: k3-j722s-evm: Enable UHS support for MMCSD arm64: dts: ti: k3-j784s4-main: Enable support for UHS mode arm64: dts: ti: k3-j721s2-main: Enable support for SDR104 speed mode arm64: dts: ti: k3-am62a: Enable UHS mode support for SD cards arm64: dts: ti: k3-am65-main: Remove unused properties in sdhci nodes arm64: dts: ti: k3-am65-main: Fix sdhci node properties arm64: dts: ti: Enable overlays for the am625-phyboard-lyra arm64: dts: ti: am64-phyboard-electra: Add overlay to enable a GPIO fan arm64: dts: ti: k3-am62a-main: Add Wave5 Video Encoder/Decoder Node arm64: dts: ti: k3-am69-sk: Fix UART pin type and macro type arm64: dts: ti: k3-j784s4-evm: Fix UART pin type and macro type arm64: dts: ti: k3-am62a: Disable USB LPM arm64: dts: ti: k3-am62p: add the USB sub-system ... Link: https://lore.kernel.org/r/20240501124319.ake5j2oc5pbnn5nb@contour Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 832cf6e + f329598 commit d10ee71

38 files changed

Lines changed: 597 additions & 167 deletions

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t.dtb
4848
dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-pcie.dtb
4949
dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-usb3.dtb
5050
dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-rdk.dtb
51+
dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-gpio-fan.dtbo
5152
dtb-$(CONFIG_ARCH_K3) += k3-am642-sk.dtb
5253
dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl.dtb
5354
dtb-$(CONFIG_ARCH_K3) += k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
@@ -131,6 +132,8 @@ k3-am62p5-sk-csi2-tevi-ov5640-dtbs := k3-am62p5-sk.dtb \
131132
k3-am62x-sk-csi2-tevi-ov5640.dtbo
132133
k3-am642-evm-icssg1-dualemac-dtbs := \
133134
k3-am642-evm.dtb k3-am642-evm-icssg1-dualemac.dtbo
135+
k3-am642-phyboard-electra-gpio-fan-dtbs := \
136+
k3-am642-phyboard-electra-rdk.dtb k3-am642-phyboard-electra-gpio-fan.dtbo
134137
k3-am642-tqma64xxl-mbax4xxl-sdcard-dtbs := \
135138
k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
136139
k3-am642-tqma64xxl-mbax4xxl-wlan-dtbs := \
@@ -161,19 +164,21 @@ dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
161164
k3-am642-evm-icssg1-dualemac.dtb \
162165
k3-am642-tqma64xxl-mbax4xxl-sdcard.dtb \
163166
k3-am642-tqma64xxl-mbax4xxl-wlan.dtb \
164-
k3-am68-sk-base-board-csi2-dual-imx219-dtbs \
165-
k3-am69-sk-csi2-dual-imx219-dtbs \
167+
k3-am68-sk-base-board-csi2-dual-imx219.dtb \
168+
k3-am69-sk-csi2-dual-imx219.dtb \
166169
k3-j721e-evm-pcie0-ep.dtb \
167-
k3-j721e-sk-csi2-dual-imx219-dtbs \
170+
k3-j721e-sk-csi2-dual-imx219.dtb \
168171
k3-j721s2-evm-pcie1-ep.dtb
169172

170173
# Enable support for device-tree overlays
171174
DTC_FLAGS_k3-am625-beagleplay += -@
175+
DTC_FLAGS_k3-am625-phyboard-lyra-rdk += -@
172176
DTC_FLAGS_k3-am625-sk += -@
173177
DTC_FLAGS_k3-am62-lp-sk += -@
174178
DTC_FLAGS_k3-am62a7-sk += -@
175179
DTC_FLAGS_k3-am62p5-sk += -@
176180
DTC_FLAGS_k3-am642-evm += -@
181+
DTC_FLAGS_k3-am642-phyboard-electra-rdk += -@
177182
DTC_FLAGS_k3-am642-tqma64xxl-mbax4xxl += -@
178183
DTC_FLAGS_k3-am6548-iot2050-advanced-m2 += -@
179184
DTC_FLAGS_k3-am68-sk-base-board += -@

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -619,10 +619,11 @@
619619

620620
usbss0: dwc3-usb@f900000 {
621621
compatible = "ti,am62-usb";
622-
reg = <0x00 0x0f900000 0x00 0x800>;
622+
reg = <0x00 0x0f900000 0x00 0x800>,
623+
<0x00 0x0f908000 0x00 0x400>;
623624
clocks = <&k3_clks 161 3>;
624625
clock-names = "ref";
625-
ti,syscon-phy-pll-refclk = <&wkup_conf 0x4008>;
626+
ti,syscon-phy-pll-refclk = <&usb0_phy_ctrl 0x0>;
626627
#address-cells = <2>;
627628
#size-cells = <2>;
628629
power-domains = <&k3_pds 178 TI_SCI_PD_EXCLUSIVE>;
@@ -644,10 +645,11 @@
644645

645646
usbss1: dwc3-usb@f910000 {
646647
compatible = "ti,am62-usb";
647-
reg = <0x00 0x0f910000 0x00 0x800>;
648+
reg = <0x00 0x0f910000 0x00 0x800>,
649+
<0x00 0x0f918000 0x00 0x400>;
648650
clocks = <&k3_clks 162 3>;
649651
clock-names = "ref";
650-
ti,syscon-phy-pll-refclk = <&wkup_conf 0x4018>;
652+
ti,syscon-phy-pll-refclk = <&usb1_phy_ctrl 0x0>;
651653
#address-cells = <2>;
652654
#size-cells = <2>;
653655
power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>;

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

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
simple-audio-card,format = "i2s";
2323
simple-audio-card,frame-master = <&codec_dai>;
2424
simple-audio-card,name = "verdin-wm8904";
25+
simple-audio-card,mclk-fs = <256>;
2526
simple-audio-card,routing =
2627
"Headphone Jack", "HPOUTL",
2728
"Headphone Jack", "HPOUTR",
@@ -35,14 +36,22 @@
3536
"Line", "Line In Jack";
3637

3738
codec_dai: simple-audio-card,codec {
38-
clocks = <&audio_refclk1>;
3939
sound-dai = <&wm8904_1a>;
4040
};
4141

4242
simple-audio-card,cpu {
4343
sound-dai = <&mcasp0>;
4444
};
4545
};
46+
47+
reg_usb_hub: regulator-usb-hub {
48+
compatible = "regulator-fixed";
49+
enable-active-high;
50+
/* Verdin CTRL_SLEEP_MOCI# (SODIMM 256) */
51+
gpio = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;
52+
regulator-boot-on;
53+
regulator-name = "HUB_PWR_EN";
54+
};
4655
};
4756

4857
/* Verdin ETHs */
@@ -160,7 +169,8 @@
160169
pinctrl-0 = <&pinctrl_gpio_1>,
161170
<&pinctrl_gpio_2>,
162171
<&pinctrl_gpio_3>,
163-
<&pinctrl_gpio_4>;
172+
<&pinctrl_gpio_4>,
173+
<&pinctrl_pcie_1_reset>;
164174
};
165175

166176
/* Verdin I2C_3_HDMI */
@@ -183,6 +193,11 @@
183193
status = "okay";
184194
};
185195

196+
/* Do not force CTRL_SLEEP_MOCI# always enabled */
197+
&reg_force_sleep_moci {
198+
status = "disabled";
199+
};
200+
186201
/* Verdin SD_1 */
187202
&sdhci1 {
188203
status = "okay";
@@ -203,14 +218,27 @@
203218
};
204219

205220
&usb1 {
221+
#address-cells = <1>;
222+
#size-cells = <0>;
206223
status = "okay";
224+
225+
usb-hub@1 {
226+
compatible = "usb424,2744";
227+
reg = <1>;
228+
vdd-supply = <&reg_usb_hub>;
229+
};
207230
};
208231

209232
/* Verdin CTRL_WAKE1_MICO# */
210233
&verdin_gpio_keys {
211234
status = "okay";
212235
};
213236

237+
/* Verdin PCIE_1_RESET# */
238+
&verdin_pcie_1_reset_hog {
239+
status = "okay";
240+
};
241+
214242
/* Verdin UART_2 */
215243
&wkup_uart0 {
216244
status = "okay";

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@
181181
pinctrl-0 = <&pinctrl_gpio_1>,
182182
<&pinctrl_gpio_2>,
183183
<&pinctrl_gpio_3>,
184-
<&pinctrl_gpio_4>;
184+
<&pinctrl_gpio_4>,
185+
<&pinctrl_pcie_1_reset>;
185186
};
186187

187188
/* Verdin I2C_3_HDMI */
@@ -232,6 +233,11 @@
232233
status = "okay";
233234
};
234235

236+
/* Verdin PCIE_1_RESET# */
237+
&verdin_pcie_1_reset_hog {
238+
status = "okay";
239+
};
240+
235241
/* Verdin UART_2 */
236242
&wkup_uart0 {
237243
status = "okay";

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@
8181
&main_gpio0 {
8282
pinctrl-names = "default";
8383
pinctrl-0 = <&pinctrl_ctrl_sleep_moci>,
84-
<&pinctrl_gpio_1>,
85-
<&pinctrl_gpio_2>,
86-
<&pinctrl_gpio_3>,
87-
<&pinctrl_gpio_4>;
84+
<&pinctrl_gpio_5>,
85+
<&pinctrl_gpio_6>,
86+
<&pinctrl_gpio_7>,
87+
<&pinctrl_gpio_8>;
8888
};
8989

9090
/* Verdin I2C_1 */
@@ -149,6 +149,15 @@
149149
status = "okay";
150150
};
151151

152+
&mcu_gpio0 {
153+
pinctrl-names = "default";
154+
pinctrl-0 = <&pinctrl_gpio_1>,
155+
<&pinctrl_gpio_2>,
156+
<&pinctrl_gpio_3>,
157+
<&pinctrl_gpio_4>,
158+
<&pinctrl_pcie_1_reset>;
159+
};
160+
152161
/* Verdin I2C_3_HDMI */
153162
&mcu_i2c0 {
154163
status = "okay";
@@ -192,6 +201,11 @@
192201
status = "okay";
193202
};
194203

204+
/* Verdin PCIE_1_RESET# */
205+
&verdin_pcie_1_reset_hog {
206+
status = "okay";
207+
};
208+
195209
/* Verdin UART_2 */
196210
&wkup_uart0 {
197211
status = "okay";

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@
159159
pinctrl-0 = <&pinctrl_gpio_1>,
160160
<&pinctrl_gpio_2>,
161161
<&pinctrl_gpio_3>,
162-
<&pinctrl_gpio_4>;
162+
<&pinctrl_gpio_4>,
163+
<&pinctrl_pcie_1_reset>;
163164
};
164165

165166
/* Verdin I2C_3_HDMI */
@@ -205,6 +206,11 @@
205206
status = "okay";
206207
};
207208

209+
/* Verdin PCIE_1_RESET# */
210+
&verdin_pcie_1_reset_hog {
211+
status = "okay";
212+
};
213+
208214
/* Verdin UART_2 */
209215
&wkup_uart0 {
210216
status = "okay";

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

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676

7777
memory@80000000 {
7878
device_type = "memory";
79-
reg = <0x00000000 0x80000000 0x00000000 0x40000000>; /* 1G RAM */
79+
reg = <0x00000000 0x80000000 0x00000000 0x80000000>; /* 2G RAM */
8080
};
8181

8282
opp-table {
@@ -138,6 +138,22 @@
138138
vin-supply = <&reg_1v8>;
139139
};
140140

141+
/*
142+
* By default we enable CTRL_SLEEP_MOCI#, this is required to have
143+
* peripherals on the carrier board powered.
144+
* If more granularity or power saving is required this can be disabled
145+
* in the carrier board device tree files.
146+
*/
147+
reg_force_sleep_moci: regulator-force-sleep-moci {
148+
compatible = "regulator-fixed";
149+
enable-active-high;
150+
/* Verdin CTRL_SLEEP_MOCI# (SODIMM 256) */
151+
gpio = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;
152+
regulator-always-on;
153+
regulator-boot-on;
154+
regulator-name = "CTRL_SLEEP_MOCI#";
155+
};
156+
141157
/* Verdin SD_1 Power Supply */
142158
reg_sdhc1_vmmc: regulator-sdhci1 {
143159
compatible = "regulator-fixed";
@@ -457,6 +473,13 @@
457473
>;
458474
};
459475

476+
/* Verdin SD_1_CD# as GPIO */
477+
pinctrl_sd1_cd_gpio: main-gpio1-48-default-pins {
478+
pinctrl-single,pins = <
479+
AM62X_IOPAD(0x240, PIN_INPUT_PULLUP, 7) /* (D17) MMC1_SDCD.GPIO1_48 */ /* SODIMM 84 */
480+
>;
481+
};
482+
460483
/* Verdin DSI_1_INT# (pulled-up as active-low) */
461484
pinctrl_dsi1_int: main-gpio1-49-default-pins {
462485
pinctrl-single,pins = <
@@ -571,7 +594,6 @@
571594
AM62X_IOPAD(0x22c, PIN_INPUT, 0) /* (B21) MMC1_DAT1 */ /* SODIMM 82 */
572595
AM62X_IOPAD(0x228, PIN_INPUT, 0) /* (C21) MMC1_DAT2 */ /* SODIMM 70 */
573596
AM62X_IOPAD(0x224, PIN_INPUT, 0) /* (D22) MMC1_DAT3 */ /* SODIMM 72 */
574-
AM62X_IOPAD(0x240, PIN_INPUT_PULLUP, 0) /* (D17) MMC1_SDCD */ /* SODIMM 84 */
575597
>;
576598
};
577599

@@ -979,14 +1001,6 @@
9791001
"",
9801002
"",
9811003
"";
982-
983-
verdin_ctrl_sleep_moci: ctrl-sleep-moci-hog {
984-
gpio-hog;
985-
/* Verdin CTRL_SLEEP_MOCI# (SODIMM 256) */
986-
gpios = <31 GPIO_ACTIVE_HIGH>;
987-
line-name = "CTRL_SLEEP_MOCI#";
988-
output-high;
989-
};
9901004
};
9911005

9921006
&main_gpio1 {
@@ -1407,6 +1421,15 @@
14071421
"",
14081422
"",
14091423
"";
1424+
1425+
verdin_pcie_1_reset_hog: pcie-1-reset-hog {
1426+
gpio-hog;
1427+
/* Verdin PCIE_1_RESET# (SODIMM 244) */
1428+
gpios = <0 GPIO_ACTIVE_LOW>;
1429+
line-name = "PCIE_1_RESET#";
1430+
output-low;
1431+
status = "disabled";
1432+
};
14101433
};
14111434

14121435
/* Verdin CAN_2 */
@@ -1441,10 +1464,12 @@
14411464
/* Verdin SD_1 */
14421465
&sdhci1 {
14431466
pinctrl-names = "default";
1444-
pinctrl-0 = <&pinctrl_sdhci1>;
1467+
pinctrl-0 = <&pinctrl_sdhci1>, <&pinctrl_sd1_cd_gpio>;
1468+
cd-gpios = <&main_gpio1 48 GPIO_ACTIVE_LOW>;
14451469
disable-wp;
14461470
vmmc-supply = <&reg_sdhc1_vmmc>;
14471471
vqmmc-supply = <&reg_sdhc1_vqmmc>;
1472+
ti,fails-without-test-cd;
14481473
status = "disabled";
14491474
};
14501475

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@
2121
compatible = "ti,am654-chipid";
2222
reg = <0x14 0x4>;
2323
};
24+
25+
usb0_phy_ctrl: syscon@4008 {
26+
compatible = "ti,am62-usb-phy-ctrl", "syscon";
27+
reg = <0x4008 0x4>;
28+
};
29+
30+
usb1_phy_ctrl: syscon@4018 {
31+
compatible = "ti,am62-usb-phy-ctrl", "syscon";
32+
reg = <0x4018 0x4>;
33+
};
2434
};
2535

2636
target-module@2b300050 {

0 commit comments

Comments
 (0)