Skip to content

Commit c47b89b

Browse files
committed
Merge tag 'ti-k3-dt-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
TI K3 device tree updates for v6.4 New features: * Overlays for CPSW9G and CPSW5G on J721e-evm, J7200-evm * Add support for AM625 based BeaglePlay, AM62-LP-SK * Audio, RTC, watchdog support for AM625 * McSPI for J7200,j721e, j721s2, J784s4 * ADC for j721s2 * Crypto acceleration, CPSW2G for J784s4 Non critical fixes: AM62, AM62a: * Fix schematics error to increase DDR to 4GB on AM62a-SK * L2Cache size fix (AM62a/AM625) * ti,vbus-divider property to USB1 on AM625-SK * Gpio count fix for AM625 J7200,j721e, j721s2, J784s4, AM68, AM69: * ti,sci-dev-id for J784s4 NAVSS nodes * j721e-sk: Drop application specific firmware name * am68-sk: Fix the gpio expander lines for production version Cleanups: * Pinmux header move to dt folder (next kernel PR, we will drop the uapi header). * j721e: ti,strobe-sel property cleanup for descoped HS400 MMC operation * tag 'ti-k3-dt-for-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (34 commits) arm64: dts: ti: k3-j784s4-evm: Add eMMC mmc0 support arm64: dts: ti: Enable audio on SK-AM62(-LP) arm64: dts: ti: k3-am62-main: Add McASP nodes arm64: dts: ti: k3-j784s4: Add MCSPI nodes arm64: dts: ti: k3-j721s2: Add MCSPI nodes arm64: dts: ti: k3-j7200: Add MCSPI nodes arm64: dts: ti: k3-j721e: Add MCSPI nodes arm64: ti: dts: Add support for AM62x LP SK arm64: dts: ti: Refractor AM625 SK dts dt-bindings: arm: ti: k3: Add compatible for AM62x LP SK arm64: dts: ti: k3-am625-sk: Add ti,vbus-divider property to usbss1 arm64: dts: ti: k3-am68-sk-base-board: Update IO EXP GPIO lines for Rev E2 arm64: dts: ti: Add k3-am625-beagleplay dt-bindings: arm: ti: Add BeaglePlay arm64: dts: ti: k3-j7200: Add overlay to enable CPSW5G ports in QSGMII mode arm64: dts: ti: j7200-main: Add CPSW5G nodes arm64: dts: ti: k3-j721e: Add overlay to enable CPSW9G ports in QSGMII mode arm64: dts: ti: k3-j721e: Add CPSW9G nodes arm64: dts: ti: k3-j784s4-evm: Enable MCU CPSW2G arm64: dts: ti: k3-j721s2-common-proc-board: Add pinmux information for ADC ... Link: https://lore.kernel.org/r/20230410140521.3u3fftgnejakqnzj@shakable Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 17e26de + 891db0c commit c47b89b

37 files changed

+2672
-261
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ properties:
2828
- description: K3 AM625 SoC
2929
items:
3030
- enum:
31+
- beagle,am625-beagleplay
3132
- ti,am625-sk
33+
- ti,am62-lp-sk
3234
- const: ti,am625
3335

3436
- description: K3 AM642 SoC

Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ additionalProperties: false
222222

223223
examples:
224224
- |
225-
#include <dt-bindings/pinctrl/k3.h>
226225
#include <dt-bindings/soc/ti,sci_pm_domain.h>
227226
#include <dt-bindings/net/ti-dp83867.h>
228227
#include <dt-bindings/interrupt-controller/irq.h>

arch/arm64/boot/dts/ti/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
# alphabetically.
1010

1111
# Boards with AM62x SoC
12+
dtb-$(CONFIG_ARCH_K3) += k3-am625-beagleplay.dtb
1213
dtb-$(CONFIG_ARCH_K3) += k3-am625-sk.dtb
14+
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb
1315

1416
# Boards with AM62Ax SoC
1517
dtb-$(CONFIG_ARCH_K3) += k3-am62a7-sk.dtb
@@ -28,11 +30,13 @@ dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-pg2.dtb
2830
dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb
2931

3032
# Boards with J7200 SoC
31-
dtb-$(CONFIG_ARCH_K3) += k3-j7200-common-proc-board.dtb
33+
k3-j7200-evm-dtbs := k3-j7200-common-proc-board.dtb k3-j7200-evm-quad-port-eth-exp.dtbo
34+
dtb-$(CONFIG_ARCH_K3) += k3-j7200-evm.dtb
3235

3336
# Boards with J721e SoC
37+
k3-j721e-evm-dtbs := k3-j721e-common-proc-board.dtb k3-j721e-evm-quad-port-eth-exp.dtbo
3438
dtb-$(CONFIG_ARCH_K3) += k3-j721e-beagleboneai64.dtb
35-
dtb-$(CONFIG_ARCH_K3) += k3-j721e-common-proc-board.dtb
39+
dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm.dtb
3640
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb
3741

3842
# Boards with J721s2 SoC
Lines changed: 231 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,231 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* AM62x LP SK: https://www.ti.com/tool/SK-AM62-LP
4+
*
5+
* Copyright (C) 2021-2023 Texas Instruments Incorporated - https://www.ti.com/
6+
*/
7+
8+
/dts-v1/;
9+
10+
#include "k3-am62x-sk-common.dtsi"
11+
12+
/ {
13+
compatible = "ti,am62-lp-sk", "ti,am625";
14+
model = "Texas Instruments AM62x LP SK";
15+
16+
vmain_pd: regulator-0 {
17+
/* TPS65988 PD CONTROLLER OUTPUT */
18+
compatible = "regulator-fixed";
19+
regulator-name = "vmain_pd";
20+
regulator-min-microvolt = <5000000>;
21+
regulator-max-microvolt = <5000000>;
22+
regulator-always-on;
23+
regulator-boot-on;
24+
};
25+
26+
vcc_5v0: regulator-1 {
27+
/* Output of TPS630702RNMR */
28+
compatible = "regulator-fixed";
29+
regulator-name = "vcc_5v0";
30+
regulator-min-microvolt = <5000000>;
31+
regulator-max-microvolt = <5000000>;
32+
vin-supply = <&vmain_pd>;
33+
regulator-always-on;
34+
regulator-boot-on;
35+
};
36+
37+
vcc_3v3_sys: regulator-2 {
38+
/* output of LM61460-Q1 */
39+
compatible = "regulator-fixed";
40+
regulator-name = "vcc_3v3_sys";
41+
regulator-min-microvolt = <3300000>;
42+
regulator-max-microvolt = <3300000>;
43+
vin-supply = <&vmain_pd>;
44+
regulator-always-on;
45+
regulator-boot-on;
46+
};
47+
48+
vdd_mmc1: regulator-3 {
49+
/* TPS22918DBVR */
50+
compatible = "regulator-fixed";
51+
regulator-name = "vdd_mmc1";
52+
regulator-min-microvolt = <3300000>;
53+
regulator-max-microvolt = <3300000>;
54+
regulator-boot-on;
55+
enable-active-high;
56+
vin-supply = <&vcc_3v3_sys>;
57+
gpio = <&exp1 3 GPIO_ACTIVE_HIGH>;
58+
};
59+
60+
vddshv_sdio: regulator-4 {
61+
compatible = "regulator-gpio";
62+
regulator-name = "vddshv_sdio";
63+
pinctrl-names = "default";
64+
pinctrl-0 = <&vddshv_sdio_pins_default>;
65+
regulator-min-microvolt = <1800000>;
66+
regulator-max-microvolt = <3300000>;
67+
regulator-boot-on;
68+
vin-supply = <&ldo1_reg>;
69+
gpios = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;
70+
states = <1800000 0x0>,
71+
<3300000 0x1>;
72+
};
73+
};
74+
75+
&main_pmx0 {
76+
vddshv_sdio_pins_default: vddshv-sdio-pins-default {
77+
pinctrl-single,pins = <
78+
AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */
79+
>;
80+
};
81+
82+
main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-pins-default {
83+
pinctrl-single,pins = <
84+
AM62X_IOPAD(0x01d4, PIN_INPUT, 7) /* (C13) UART0_RTSn.GPIO1_23 */
85+
>;
86+
};
87+
88+
pmic_irq_pins_default: pmic-irq-pins-default {
89+
pinctrl-single,pins = <
90+
AM62X_IOPAD(0x01f4, PIN_INPUT, 0) /* (B16) EXTINTn */
91+
>;
92+
};
93+
};
94+
95+
&main_i2c1 {
96+
exp1: gpio@22 {
97+
compatible = "ti,tca6424";
98+
reg = <0x22>;
99+
gpio-controller;
100+
#gpio-cells = <2>;
101+
gpio-line-names = "GPIO_CPSW2_RST", "GPIO_CPSW1_RST",
102+
"PRU_DETECT", "MMC1_SD_EN",
103+
"VPP_LDO_EN", "EXP_PS_3V3_En",
104+
"EXP_PS_5V0_En", "EXP_HAT_DETECT",
105+
"GPIO_AUD_RSTn", "GPIO_eMMC_RSTn",
106+
"UART1_FET_BUF_EN", "BT_UART_WAKE_SOC",
107+
"GPIO_HDMI_RSTn", "CSI_GPIO0",
108+
"CSI_GPIO1", "GPIO_OLDI_INT",
109+
"HDMI_INTn", "TEST_GPIO2",
110+
"MCASP1_FET_EN", "MCASP1_BUF_BT_EN",
111+
"MCASP1_FET_SEL", "UART1_FET_SEL",
112+
"", "IO_EXP_TEST_LED";
113+
114+
interrupt-parent = <&main_gpio1>;
115+
interrupts = <23 IRQ_TYPE_EDGE_FALLING>;
116+
interrupt-controller;
117+
#interrupt-cells = <2>;
118+
119+
pinctrl-names = "default";
120+
pinctrl-0 = <&main_gpio1_ioexp_intr_pins_default>;
121+
};
122+
123+
exp2: gpio@23 {
124+
compatible = "ti,tca6424";
125+
reg = <0x23>;
126+
gpio-controller;
127+
#gpio-cells = <2>;
128+
gpio-line-names = "", "",
129+
"", "",
130+
"", "",
131+
"", "",
132+
"WL_LT_EN", "CSI_RSTz",
133+
"", "",
134+
"", "",
135+
"", "",
136+
"SPI0_FET_SEL", "SPI0_FET_OE",
137+
"GPIO_OLDI_RSTn", "PRU_3V3_EN",
138+
"", "",
139+
"CSI_VLDO_SEL", "SOC_WLAN_SDIO_RST";
140+
};
141+
};
142+
143+
&sdhci1 {
144+
vmmc-supply = <&vdd_mmc1>;
145+
vqmmc-supply = <&vddshv_sdio>;
146+
};
147+
148+
&cpsw_port2 {
149+
status = "disabled";
150+
};
151+
152+
&main_i2c0 {
153+
tps65219: pmic@30 {
154+
compatible = "ti,tps65219";
155+
reg = <0x30>;
156+
buck1-supply = <&vcc_3v3_sys>;
157+
buck2-supply = <&vcc_3v3_sys>;
158+
buck3-supply = <&vcc_3v3_sys>;
159+
ldo1-supply = <&vcc_3v3_sys>;
160+
ldo2-supply = <&buck2_reg>;
161+
ldo3-supply = <&vcc_3v3_sys>;
162+
ldo4-supply = <&vcc_3v3_sys>;
163+
164+
pinctrl-names = "default";
165+
pinctrl-0 = <&pmic_irq_pins_default>;
166+
167+
interrupt-parent = <&gic500>;
168+
interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
169+
ti,power-button;
170+
171+
regulators {
172+
buck1_reg: buck1 {
173+
regulator-name = "VDD_CORE";
174+
regulator-min-microvolt = <750000>;
175+
regulator-max-microvolt = <750000>;
176+
regulator-boot-on;
177+
regulator-always-on;
178+
};
179+
180+
buck2_reg: buck2 {
181+
regulator-name = "VCC1V8_SYS";
182+
regulator-min-microvolt = <1800000>;
183+
regulator-max-microvolt = <1800000>;
184+
regulator-boot-on;
185+
regulator-always-on;
186+
};
187+
188+
buck3_reg: buck3 {
189+
regulator-name = "VDD_LPDDR4";
190+
regulator-min-microvolt = <1100000>;
191+
regulator-max-microvolt = <1100000>;
192+
regulator-boot-on;
193+
regulator-always-on;
194+
};
195+
196+
ldo1_reg: ldo1 {
197+
regulator-name = "VDDSHV_SDIO";
198+
regulator-min-microvolt = <3300000>;
199+
regulator-max-microvolt = <3300000>;
200+
};
201+
202+
ldo2_reg: ldo2 {
203+
regulator-name = "VDDAR_CORE";
204+
regulator-min-microvolt = <850000>;
205+
regulator-max-microvolt = <850000>;
206+
regulator-boot-on;
207+
regulator-always-on;
208+
};
209+
210+
ldo3_reg: ldo3 {
211+
regulator-name = "VDDA_1V8";
212+
regulator-min-microvolt = <1800000>;
213+
regulator-max-microvolt = <1800000>;
214+
regulator-boot-on;
215+
regulator-always-on;
216+
};
217+
218+
ldo4_reg: ldo4 {
219+
regulator-name = "VDD_1V2";
220+
regulator-min-microvolt = <1200000>;
221+
regulator-max-microvolt = <1200000>;
222+
regulator-boot-on;
223+
regulator-always-on;
224+
};
225+
};
226+
};
227+
};
228+
229+
&tlv320aic3106 {
230+
DVDD-supply = <&buck2_reg>;
231+
};

0 commit comments

Comments
 (0)