Skip to content

Commit 2707977

Browse files
committed
Merge tag 'ti-k3-dt-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
TI K3 device tree updates for v6.7 New features across K3 SoCs: - Watchdog and ESM nodes for J7xx - DMA node for Camera interface (CSI) for J7xx - C7x DSP and R5F rproc support for J7xx/AM68/AM69 AM68: - USB and PCIe support AM64: - IO expander support - GPIO LED, I2C device supplies for am64-tqma64xxl-mbax4xxl - RTC IRQ pin update for am64 phycore AM62A: - TPS6593 PMIC and mcasp audio support Misc: - bootph-* tag addition for AM64 and AM62 - iw416 based bluetooth support on verdin-am62 - IO Expander addition for AM64 and AM65 boards Fixes: - Convert DMSS/NAVSS to simple-bus compatible to squelch dtbs_check warnings - Minor indentation fixes - Specify base dtb for k3-j721s2-evm-gesi.dtbo and k3-am62x-sk-hdmi-audio.dtbo - Misc fixups for AM62 Beagleplay, verdin-am62 boards * tag 'ti-k3-dt-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (48 commits) arm64: dts: ti: k3-j712s2-mcu: Add the mcu domain watchdog instances arm64: dts: ti: k3-j721s2-main: Add the main domain watchdog instances arm64: dts: ti: k3-j784s4-mcu: Add the mcu domain watchdog instances arm64: dts: ti: k3-j784s4-main: Add the main domain watchdog instances arm64: dts: ti: k3-j7200: Add MCU domain ESM instance arm64: dts: ti: k3-j784s4: Add ESM instances arm64: dts: ti: k3-j721s2: Add ESM instances arm64: dts: ti: k3-j784s4-main: Add BCDMA instance for CSI2RX arm64: dts: ti: k3-j721s2-main: Add BCDMA instance for CSI2RX arm64: dts: ti: k3-*: Convert NAVSS to simple-bus arm64: dts: ti: k3-*: Convert DMSS to simple-bus arm64: dts: ti: Fix HDMI Audio overlay in Makefile arm64: dts: ti: k3-am62a7-sk: Enable audio on AM62A arm64: dts: ti: k3-am62a7-sk: Add support for TPS6593 PMIC arm64: dts: ti: k3-am62a7-sk: Drop i2c-1 to 100Khz arm64: dts: ti: k3-am62a7-sk: Split vcc_3v3 regulators arm64: dts: ti: k3-am62a-main: Add nodes for McASP arm64: dts: ti: k3-am64-tqma64xxl-mbax4xxl: update gpio-led configuration arm64: dts: ti: k3-am64-tqma64xxl-mbax4xxl: add chassis-type arm64: dts: ti: k3-am64-tqma64xxl-mbax4xxl: add muxing for GPIOs on pin headers ... Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 79d0162 + 56bc311 commit 2707977

37 files changed

+1925
-32
lines changed

arch/arm64/boot/dts/ti/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
# alphabetically.
1010

1111
# Boards with AM62x SoC
12+
k3-am625-sk-hdmi-audio-dtbs := k3-am625-sk.dtb k3-am62x-sk-hdmi-audio.dtbo
13+
k3-am62-lp-sk-hdmi-audio-dtbs := k3-am62-lp-sk.dtb k3-am62x-sk-hdmi-audio.dtbo
1214
dtb-$(CONFIG_ARCH_K3) += k3-am625-beagleplay.dtb
1315
dtb-$(CONFIG_ARCH_K3) += k3-am625-phyboard-lyra-rdk.dtb
1416
dtb-$(CONFIG_ARCH_K3) += k3-am625-sk.dtb
@@ -19,7 +21,8 @@ dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dahlia.dtb
1921
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dev.dtb
2022
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-yavia.dtb
2123
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb
22-
dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-hdmi-audio.dtbo
24+
dtb-$(CONFIG_ARCH_K3) += k3-am625-sk-hdmi-audio.dtb
25+
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk-hdmi-audio.dtb
2326

2427
# Boards with AM62Ax SoC
2528
dtb-$(CONFIG_ARCH_K3) += k3-am62a7-sk.dtb
@@ -66,6 +69,8 @@ dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb
6669
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
6770
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb
6871
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-gesi-exp-board.dtbo
72+
k3-j721s2-evm-dtbs := k3-j721s2-common-proc-board.dtb k3-j721s2-evm-gesi-exp-board.dtbo
73+
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm.dtb
6974

7075
# Boards with J784s4 SoC
7176
dtb-$(CONFIG_ARCH_K3) += k3-am69-sk.dtb

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181
};
8282

8383
dmss: bus@48000000 {
84-
compatible = "simple-mfd";
84+
bootph-all;
85+
compatible = "simple-bus";
8586
#address-cells = <2>;
8687
#size-cells = <2>;
8788
dma-ranges;
@@ -90,6 +91,7 @@
9091
ti,sci-dev-id = <25>;
9192

9293
secure_proxy_main: mailbox@4d000000 {
94+
bootph-all;
9395
compatible = "ti,am654-secure-proxy";
9496
#mbox-cells = <1>;
9597
reg-names = "target_data", "rt", "scfg";
@@ -165,6 +167,7 @@
165167
};
166168

167169
dmsc: system-controller@44043000 {
170+
bootph-all;
168171
compatible = "ti,k2g-sci";
169172
ti,host-id = <12>;
170173
mbox-names = "rx", "tx";
@@ -174,16 +177,19 @@
174177
reg = <0x00 0x44043000 0x00 0xfe0>;
175178

176179
k3_pds: power-controller {
180+
bootph-all;
177181
compatible = "ti,sci-pm-domain";
178182
#power-domain-cells = <2>;
179183
};
180184

181185
k3_clks: clock-controller {
186+
bootph-all;
182187
compatible = "ti,k2g-sci-clk";
183188
#clock-cells = <2>;
184189
};
185190

186191
k3_reset: reset-controller {
192+
bootph-all;
187193
compatible = "ti,sci-reset";
188194
#reset-cells = <2>;
189195
};
@@ -202,6 +208,7 @@
202208
};
203209

204210
secure_proxy_sa3: mailbox@43600000 {
211+
bootph-pre-ram;
205212
compatible = "ti,am654-secure-proxy";
206213
#mbox-cells = <1>;
207214
reg-names = "target_data", "rt", "scfg";
@@ -217,6 +224,7 @@
217224
};
218225

219226
main_pmx0: pinctrl@f4000 {
227+
bootph-all;
220228
compatible = "pinctrl-single";
221229
reg = <0x00 0xf4000 0x00 0x2ac>;
222230
#pinctrl-cells = <1>;
@@ -225,12 +233,14 @@
225233
};
226234

227235
main_esm: esm@420000 {
236+
bootph-pre-ram;
228237
compatible = "ti,j721e-esm";
229238
reg = <0x00 0x420000 0x00 0x1000>;
230239
ti,esm-pins = <160>, <161>, <162>, <163>, <177>, <178>;
231240
};
232241

233242
main_timer0: timer@2400000 {
243+
bootph-all;
234244
compatible = "ti,am654-timer";
235245
reg = <0x00 0x2400000 0x00 0x400>;
236246
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
&cbass_mcu {
99
mcu_pmx0: pinctrl@4084000 {
10+
bootph-all;
1011
compatible = "pinctrl-single";
1112
reg = <0x00 0x04084000 0x00 0x88>;
1213
#pinctrl-cells = <1>;
@@ -15,6 +16,7 @@
1516
};
1617

1718
mcu_esm: esm@4100000 {
19+
bootph-pre-ram;
1820
compatible = "ti,j721e-esm";
1921
reg = <0x00 0x4100000 0x00 0x1000>;
2022
ti,esm-pins = <0>, <1>, <2>, <85>;

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,11 @@
3535
&main_uart5 {
3636
pinctrl-names = "default";
3737
pinctrl-0 = <&pinctrl_uart5>;
38+
uart-has-rtscts;
3839
status = "okay";
40+
41+
bluetooth {
42+
compatible = "nxp,88w8987-bt";
43+
fw-init-baudrate = <3000000>;
44+
};
3945
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,7 @@
10611061
vddc-supply = <&reg_1v2_dsi>;
10621062
vddmipi-supply = <&reg_1v2_dsi>;
10631063
vddio-supply = <&reg_1v8_dsi>;
1064+
status = "disabled";
10641065

10651066
dsi_bridge_ports: ports {
10661067
#address-cells = <1>;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77

88
&cbass_wakeup {
99
wkup_conf: syscon@43000000 {
10+
bootph-all;
1011
compatible = "syscon", "simple-mfd";
1112
reg = <0x00 0x43000000 0x00 0x20000>;
1213
#address-cells = <1>;
1314
#size-cells = <1>;
1415
ranges = <0x0 0x00 0x43000000 0x20000>;
1516

1617
chipid: chipid@14 {
18+
bootph-all;
1719
compatible = "ti,am654-chipid";
1820
reg = <0x14 0x4>;
1921
};

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
};
4848

4949
cbass_main: bus@f0000 {
50+
bootph-all;
5051
compatible = "simple-bus";
5152
#address-cells = <2>;
5253
#size-cells = <2>;
@@ -86,13 +87,15 @@
8687
<0x00 0x43000000 0x00 0x43000000 0x00 0x00020000>;
8788

8889
cbass_mcu: bus@4000000 {
90+
bootph-all;
8991
compatible = "simple-bus";
9092
#address-cells = <2>;
9193
#size-cells = <2>;
9294
ranges = <0x00 0x04000000 0x00 0x04000000 0x00 0x01ff1400>; /* Peripheral window */
9395
};
9496

9597
cbass_wakeup: bus@b00000 {
98+
bootph-all;
9699
compatible = "simple-bus";
97100
#address-cells = <2>;
98101
#size-cells = <2>;

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

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
};
4747

4848
memory@80000000 {
49+
bootph-pre-ram;
4950
device_type = "memory";
5051
/* 2G RAM */
5152
reg = <0x00000000 0x80000000 0x00000000 0x80000000>;
@@ -58,7 +59,7 @@
5859

5960
ramoops: ramoops@9ca00000 {
6061
compatible = "ramoops";
61-
reg = <0x00 0x9c700000 0x00 0x00100000>;
62+
reg = <0x00 0x9ca00000 0x00 0x00100000>;
6263
record-size = <0x8000>;
6364
console-size = <0x8000>;
6465
ftrace-size = <0x00>;
@@ -83,6 +84,7 @@
8384
};
8485

8586
vsys_5v0: regulator-1 {
87+
bootph-all;
8688
compatible = "regulator-fixed";
8789
regulator-name = "vsys_5v0";
8890
regulator-min-microvolt = <5000000>;
@@ -93,6 +95,7 @@
9395

9496
vdd_3v3: regulator-2 {
9597
/* output of TLV62595DMQR-U12 */
98+
bootph-all;
9699
compatible = "regulator-fixed";
97100
regulator-name = "vdd_3v3";
98101
regulator-min-microvolt = <3300000>;
@@ -118,6 +121,7 @@
118121

119122
vdd_3v3_sd: regulator-4 {
120123
/* output of TPS22918DBVR-U21 */
124+
bootph-all;
121125
pinctrl-names = "default";
122126
pinctrl-0 = <&vdd_3v3_sd_pins_default>;
123127

@@ -132,6 +136,7 @@
132136
};
133137

134138
vdd_sd_dv: regulator-5 {
139+
bootph-all;
135140
compatible = "regulator-gpio";
136141
regulator-name = "sd_hs200_switch";
137142
pinctrl-names = "default";
@@ -146,33 +151,39 @@
146151
};
147152

148153
leds {
154+
bootph-all;
149155
compatible = "gpio-leds";
150156

151157
led-0 {
158+
bootph-all;
152159
gpios = <&main_gpio0 3 GPIO_ACTIVE_HIGH>;
153160
linux,default-trigger = "heartbeat";
154161
function = LED_FUNCTION_HEARTBEAT;
155162
default-state = "off";
156163
};
157164

158165
led-1 {
166+
bootph-all;
159167
gpios = <&main_gpio0 4 GPIO_ACTIVE_HIGH>;
160168
linux,default-trigger = "disk-activity";
161169
function = LED_FUNCTION_DISK_ACTIVITY;
162170
default-state = "keep";
163171
};
164172

165173
led-2 {
174+
bootph-all;
166175
gpios = <&main_gpio0 5 GPIO_ACTIVE_HIGH>;
167176
function = LED_FUNCTION_CPU;
168177
};
169178

170179
led-3 {
180+
bootph-all;
171181
gpios = <&main_gpio0 6 GPIO_ACTIVE_HIGH>;
172182
function = LED_FUNCTION_LAN;
173183
};
174184

175185
led-4 {
186+
bootph-all;
176187
gpios = <&main_gpio0 9 GPIO_ACTIVE_HIGH>;
177188
function = LED_FUNCTION_WLAN;
178189
};
@@ -245,6 +256,7 @@
245256

246257
&main_pmx0 {
247258
gpio0_pins_default: gpio0-default-pins {
259+
bootph-all;
248260
pinctrl-single,pins = <
249261
AM62X_IOPAD(0x0004, PIN_INPUT, 7) /* (G25) OSPI0_LBCLKO.GPIO0_1 */
250262
AM62X_IOPAD(0x0008, PIN_INPUT, 7) /* (J24) OSPI0_DQS.GPIO0_2 */
@@ -264,6 +276,7 @@
264276
};
265277

266278
vdd_sd_dv_pins_default: vdd-sd-default-pins {
279+
bootph-all;
267280
pinctrl-single,pins = <
268281
AM62X_IOPAD(0x0244, PIN_OUTPUT, 7) /* (C17) MMC1_SDWP.GPIO1_49 */
269282
>;
@@ -283,6 +296,7 @@
283296
};
284297

285298
local_i2c_pins_default: local-i2c-default-pins {
299+
bootph-all;
286300
pinctrl-single,pins = <
287301
AM62X_IOPAD(0x01e0, PIN_INPUT_PULLUP, 0) /* (B16) I2C0_SCL */
288302
AM62X_IOPAD(0x01e4, PIN_INPUT_PULLUP, 0) /* (A16) I2C0_SDA */
@@ -321,6 +335,7 @@
321335
};
322336

323337
emmc_pins_default: emmc-default-pins {
338+
bootph-all;
324339
pinctrl-single,pins = <
325340
AM62X_IOPAD(0x0220, PIN_INPUT, 0) /* (Y3) MMC0_CMD */
326341
AM62X_IOPAD(0x0218, PIN_INPUT, 0) /* (AB1) MMC0_CLK */
@@ -336,12 +351,14 @@
336351
};
337352

338353
vdd_3v3_sd_pins_default: vdd-3v3-sd-default-pins {
354+
bootph-all;
339355
pinctrl-single,pins = <
340356
AM62X_IOPAD(0x01c4, PIN_INPUT, 7) /* (B14) SPI0_D1_GPIO1_19 */
341357
>;
342358
};
343359

344360
sd_pins_default: sd-default-pins {
361+
bootph-all;
345362
pinctrl-single,pins = <
346363
AM62X_IOPAD(0x023c, PIN_INPUT, 0) /* (A21) MMC1_CMD */
347364
AM62X_IOPAD(0x0234, PIN_INPUT, 0) /* (B22) MMC1_CLK */
@@ -418,6 +435,7 @@
418435
};
419436

420437
mikrobus_gpio_pins_default: mikrobus-gpio-default-pins {
438+
bootph-all;
421439
pinctrl-single,pins = <
422440
AM62X_IOPAD(0x019c, PIN_INPUT, 7) /* (B18) MCASP0_AXR1.GPIO1_9 */
423441
AM62X_IOPAD(0x01a0, PIN_INPUT, 7) /* (E18) MCASP0_AXR0.GPIO1_10 */
@@ -426,6 +444,7 @@
426444
};
427445

428446
console_pins_default: console-default-pins {
447+
bootph-all;
429448
pinctrl-single,pins = <
430449
AM62X_IOPAD(0x01c8, PIN_INPUT, 0) /* (D14) UART0_RXD */
431450
AM62X_IOPAD(0x01cc, PIN_OUTPUT, 0) /* (E14) UART0_TXD */
@@ -597,6 +616,7 @@
597616
};
598617

599618
&main_gpio0 {
619+
bootph-all;
600620
pinctrl-names = "default";
601621
pinctrl-0 = <&gpio0_pins_default>;
602622
gpio-line-names = "BL_EN_3V3", "SPE_PO_EN", "RTC_INT", /* 0-2 */
@@ -616,6 +636,7 @@
616636
};
617637

618638
&main_gpio1 {
639+
bootph-all;
619640
pinctrl-names = "default";
620641
pinctrl-0 = <&mikrobus_gpio_pins_default>;
621642
gpio-line-names = "", "", "", "", "", /* 0-4 */
@@ -633,6 +654,7 @@
633654
};
634655

635656
&main_i2c0 {
657+
bootph-all;
636658
pinctrl-names = "default";
637659
pinctrl-0 = <&local_i2c_pins_default>;
638660
clock-frequency = <400000>;
@@ -651,6 +673,7 @@
651673
};
652674

653675
tps65219: pmic@30 {
676+
bootph-all;
654677
compatible = "ti,tps65219";
655678
reg = <0x30>;
656679
buck1-supply = <&vsys_5v0>;
@@ -801,6 +824,7 @@
801824
};
802825

803826
&sdhci0 {
827+
bootph-all;
804828
pinctrl-names = "default";
805829
pinctrl-0 = <&emmc_pins_default>;
806830
ti,driver-strength-ohm = <50>;
@@ -810,6 +834,7 @@
810834

811835
&sdhci1 {
812836
/* SD/MMC */
837+
bootph-all;
813838
pinctrl-names = "default";
814839
pinctrl-0 = <&sd_pins_default>;
815840

@@ -850,6 +875,7 @@
850875
};
851876

852877
&main_uart0 {
878+
bootph-all;
853879
pinctrl-names = "default";
854880
pinctrl-0 = <&console_pins_default>;
855881
status = "okay";

0 commit comments

Comments
 (0)