Skip to content

Commit 44b5179

Browse files
arndbarndb
committed
Merge tag 'ti-k3-dt-for-v7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/arm
TI K3 device tree updates for v7.1 Generic Fixes/Cleanups: - k3-pinctrl: Cleanup alignment and reorder macros - ti,min-output-impedance addition to all K3 board DT files SoC Specific Features and Fixes: AM62L: - Add RNG node - Support cpufreq scaling J721S2: - Make MAIN domain system control bus a simple-bus - Add second DSI node J722S: - Add main_i2c4 device node J7200: - Make MAIN domain system control bus a simple-bus Board Specific Features and Fixes: AM642 EVM: - Add ICSSG0 overlay for dual EMAC support AM62: - LP-SK: Enable internal pulls for MMC0 data pins - SK: Enable Main UART wakeup - phycore-som: Add 128MiB of global CMA - Verdin: Add Zinnia board support and misc cleanup AM62A7-SK: - Enable Main UART wakeup - Fix pin name in comment from M19 to N22 AM62D2 EVM: - Enable Main UART wakeup and set wakeup-source system-states AM62L3 EVM: - Disable MMC1 internal pulls on data pins - Enable Main UART wakeup and enable wkup_uart0 pins/target node AM62P: - SK: Disable MMC1 internal pulls on data pins and enable Main UART wakeup - Verdin: Add Zinnia support and misc cleanup AM68 PHYBoard: - Add DSI->LVDS bridge, LVDS-Display overlay and PEB-AV-15 overlay AM69 Aquila: - Fix DP regulator enable GPIO J721S2 CPB: - Add QSPI flash partition details Removal of SMARC-sAM67 board: - Kontron SMARC-sAM67 board support along with all bindings are dropped as board is no longer planned for production * tag 'ti-k3-dt-for-v7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: (47 commits) arm64: dts: ti: k3-pinctrl: sort shift values numerically arm64: dts: ti: k3-pinctrl: consistently use tabs for alignment arm64: dts: ti: k3-am642-evm: Add ICSSG0 overlay for dual EMAC support arm64: dts: ti: k3-am62p-verdin: Add Zinnia arm64: dts: ti: k3-am62p-verdin: Add SPI_1_CS as GPIO arm64: dts: ti: k3-am62p-verdin: Split UART_2 pinctrl group arm64: dts: ti: k3-am62-verdin: Add Zinnia arm64: dts: ti: k3-am62-verdin: Split UART_2 pinctrl group arm64: dts: ti: k3-am62-verdin: Fix SPI_1 GPIO CS pinctrl label dt-bindings: arm: ti: Add verdin am62/am62p zinnia board arm64: dts: ti: k3-j721s2: Make MAIN domain system control bus a simple-bus arm64: dts: ti: k3-j7200: Make MAIN domain system control bus a simple-bus arm64: dts: ti: k3-am62-lp-sk: Enable internal pulls for MMC0 data pins arm64: dts: ti: k3-am62l3-evm: Disable MMC1 internal pulls on data pins arm64: dts: ti: k3-am62p5-sk: Disable MMC1 internal pulls on data pins arm64: dts: ti: k3-am62d2-evm: Enable Main UART wakeup arm64: dts: ti: k3-am62l3-evm: Enable Main UART wakeup arm64: dts: ti: k3-am62p5-sk: Enable Main UART wakeup arm64: dts: ti: k3-am62a7-sk: Enable Main UART wakeup arm64: dts: ti: k3-am62x-sk-common: Enable Main UART wakeup ... Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents e00482b + 47c806d commit 44b5179

47 files changed

Lines changed: 2030 additions & 1481 deletions

Some content is hidden

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

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ properties:
7979
- toradex,verdin-am62-nonwifi-ivy # Verdin AM62 Module on Ivy
8080
- toradex,verdin-am62-nonwifi-mallow # Verdin AM62 Module on Mallow
8181
- toradex,verdin-am62-nonwifi-yavia # Verdin AM62 Module on Yavia
82+
- toradex,verdin-am62-nonwifi-zinnia # Verdin AM62 Module on Zinnia
8283
- const: toradex,verdin-am62-nonwifi # Verdin AM62 Module without Wi-Fi / BT
8384
- const: toradex,verdin-am62 # Verdin AM62 Module
8485
- const: ti,am625
@@ -91,6 +92,7 @@ properties:
9192
- toradex,verdin-am62-wifi-ivy # Verdin AM62 Wi-Fi / BT Module on Ivy
9293
- toradex,verdin-am62-wifi-mallow # Verdin AM62 Wi-Fi / BT Module on Mallow
9394
- toradex,verdin-am62-wifi-yavia # Verdin AM62 Wi-Fi / BT Module on Yavia
95+
- toradex,verdin-am62-wifi-zinnia # Verdin AM62 Wi-Fi / BT Module on Zinnia
9496
- const: toradex,verdin-am62-wifi # Verdin AM62 Wi-Fi / BT Module
9597
- const: toradex,verdin-am62 # Verdin AM62 Module
9698
- const: ti,am625
@@ -103,6 +105,7 @@ properties:
103105
- toradex,verdin-am62p-nonwifi-ivy # Verdin AM62P Module on Ivy
104106
- toradex,verdin-am62p-nonwifi-mallow # Verdin AM62P Module on Mallow
105107
- toradex,verdin-am62p-nonwifi-yavia # Verdin AM62P Module on Yavia
108+
- toradex,verdin-am62p-nonwifi-zinnia # Verdin AM62P Module on Zinnia
106109
- const: toradex,verdin-am62p-nonwifi # Verdin AM62P Module without Wi-Fi / BT
107110
- const: toradex,verdin-am62p # Verdin AM62P Module
108111
- const: ti,am62p5
@@ -115,6 +118,7 @@ properties:
115118
- toradex,verdin-am62p-wifi-ivy # Verdin AM62P Wi-Fi / BT Module on Ivy
116119
- toradex,verdin-am62p-wifi-mallow # Verdin AM62P Wi-Fi / BT Module on Mallow
117120
- toradex,verdin-am62p-wifi-yavia # Verdin AM62P Wi-Fi / BT Module on Yavia
121+
- toradex,verdin-am62p-wifi-zinnia # Verdin AM62P Wi-Fi / BT Module on Zinnia
118122
- const: toradex,verdin-am62p-wifi # Verdin AM62P Wi-Fi / BT Module
119123
- const: toradex,verdin-am62p # Verdin AM62P Module
120124
- const: ti,am62p5
@@ -208,7 +212,6 @@ properties:
208212
items:
209213
- enum:
210214
- beagle,am67a-beagley-ai
211-
- kontron,sa67 # Kontron SMARC-sAM67 board
212215
- ti,j722s-evm
213216
- const: ti,j722s
214217

‎Documentation/devicetree/bindings/embedded-controller/kontron,sl28cpld.yaml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@ description: |
1616
1717
properties:
1818
compatible:
19-
oneOf:
20-
- items:
21-
- enum:
22-
- kontron,sa67mcu
23-
- const: kontron,sl28cpld
24-
- const: kontron,sl28cpld
19+
const: kontron,sl28cpld
2520

2621
reg:
2722
description:

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

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-dev.dtb
1919
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-ivy.dtb
2020
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-mallow.dtb
2121
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-yavia.dtb
22+
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-nonwifi-zinnia.dtb
2223
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dahlia.dtb
2324
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-dev.dtb
2425
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-ivy.dtb
2526
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-mallow.dtb
2627
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-yavia.dtb
28+
dtb-$(CONFIG_ARCH_K3) += k3-am625-verdin-wifi-zinnia.dtb
2729
dtb-$(CONFIG_ARCH_K3) += k3-am62x-phyboard-lyra-gpio-fan.dtbo
2830
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk.dtb
2931
dtb-$(CONFIG_ARCH_K3) += k3-am62-lp-sk-nand.dtbo
@@ -62,6 +64,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-am62x-sk-hdmi-audio.dtbo
6264

6365
# Boards with AM64x SoC
6466
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm.dtb
67+
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg0.dtbo
6568
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac.dtbo
6669
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac-mii.dtbo
6770
dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-pcie0-ep.dtbo
@@ -132,6 +135,12 @@ dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk-csi2-dual-imx219.dtbo
132135

133136
# Boards with J721s2 SoC
134137
dtb-$(CONFIG_ARCH_K3) += k3-am68-phyboard-izar.dtb
138+
dtb-$(CONFIG_ARCH_K3) += k3-am68-phyboard-izar-lvds-ph128800t006.dtb
139+
k3-am68-phyboard-izar-lvds-ph128800t006-dtbs := k3-am68-phyboard-izar.dtb \
140+
k3-am68-phyboard-izar-lvds-ph128800t006.dtbo
141+
dtb-$(CONFIG_ARCH_K3) += k3-am68-phyboard-izar-peb-av-15.dtb
142+
k3-am68-phyboard-izar-peb-av-15-dtbs := k3-am68-phyboard-izar.dtb \
143+
k3-am68-phyboard-izar-peb-av-15.dtbo
135144
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
136145
dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board-pcie1-ep.dtbo
137146
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb
@@ -142,17 +151,7 @@ dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-pcie1-ep.dtbo
142151
dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-usb0-type-a.dtbo
143152

144153
# Boards with J722s SoC
145-
k3-am67a-kontron-sa67-dtbs := k3-am67a-kontron-sa67-base.dtb \
146-
k3-am67a-kontron-sa67-rtc-rv8263.dtbo k3-am67a-kontron-sa67-gbe1.dtbo
147-
k3-am67a-kontron-sa67-ads2-dtbs := k3-am67a-kontron-sa67.dtb k3-am67a-kontron-sa67-ads2.dtbo
148154
dtb-$(CONFIG_ARCH_K3) += k3-am67a-beagley-ai.dtb
149-
dtb-$(CONFIG_ARCH_K3) += k3-am67a-kontron-sa67.dtb
150-
dtb-$(CONFIG_ARCH_K3) += k3-am67a-kontron-sa67-base.dtb
151-
dtb-$(CONFIG_ARCH_K3) += k3-am67a-kontron-sa67-gbe1.dtbo
152-
dtb-$(CONFIG_ARCH_K3) += k3-am67a-kontron-sa67-gpios.dtbo
153-
dtb-$(CONFIG_ARCH_K3) += k3-am67a-kontron-sa67-rtc-rv8263.dtbo
154-
dtb-$(CONFIG_ARCH_K3) += k3-am67a-kontron-sa67-ads2.dtb
155-
dtb-$(CONFIG_ARCH_K3) += k3-am67a-kontron-sa67-ads2.dtbo
156155
dtb-$(CONFIG_ARCH_K3) += k3-j722s-evm.dtb
157156
dtb-$(CONFIG_ARCH_K3) += k3-j722s-evm-csi2-quad-rpi-cam-imx219.dtbo
158157
dtb-$(CONFIG_ARCH_K3) += k3-j722s-evm-csi2-quad-tevi-ov5640.dtbo
@@ -218,6 +217,8 @@ k3-am62p5-sk-csi2-ov5640-dtbs := k3-am62p5-sk.dtb \
218217
k3-am62x-sk-csi2-ov5640.dtbo
219218
k3-am62p5-sk-csi2-tevi-ov5640-dtbs := k3-am62p5-sk.dtb \
220219
k3-am62x-sk-csi2-tevi-ov5640.dtbo
220+
k3-am642-evm-icssg0-dtbs := \
221+
k3-am642-evm.dtb k3-am642-evm-icssg0.dtbo
221222
k3-am642-evm-icssg1-dualemac-dtbs := \
222223
k3-am642-evm.dtb k3-am642-evm-icssg1-dualemac.dtbo
223224
k3-am642-evm-icssg1-dualemac-mii-dtbs := \
@@ -244,8 +245,6 @@ k3-am642-tqma64xxl-mbax4xxl-sdcard-dtbs := \
244245
k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-sdcard.dtbo
245246
k3-am642-tqma64xxl-mbax4xxl-wlan-dtbs := \
246247
k3-am642-tqma64xxl-mbax4xxl.dtb k3-am64-tqma64xxl-mbax4xxl-wlan.dtbo
247-
k3-am67a-kontron-sa67-base-gpios-dtbs := \
248-
k3-am67a-kontron-sa67-base.dtb k3-am67a-kontron-sa67-gpios.dtbo
249248
k3-am68-sk-base-board-csi2-dual-imx219-dtbs := k3-am68-sk-base-board.dtb \
250249
k3-j721e-sk-csi2-dual-imx219.dtbo
251250
k3-am68-sk-base-board-pcie1-ep-dtbs := k3-am68-sk-base-board.dtb \
@@ -306,6 +305,7 @@ dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
306305
k3-am62p5-sk-csi2-imx219.dtb \
307306
k3-am62p5-sk-csi2-ov5640.dtb \
308307
k3-am62p5-sk-csi2-tevi-ov5640.dtb \
308+
k3-am642-evm-icssg0.dtb \
309309
k3-am642-evm-icssg1-dualemac.dtb \
310310
k3-am642-evm-icssg1-dualemac-mii.dtb \
311311
k3-am642-evm-pcie0-ep.dtb \
@@ -318,7 +318,8 @@ dtb- += k3-am625-beagleplay-csi2-ov5640.dtb \
318318
k3-am642-phyboard-electra-x27-gpio1-spi1-uart3.dtb \
319319
k3-am642-tqma64xxl-mbax4xxl-sdcard.dtb \
320320
k3-am642-tqma64xxl-mbax4xxl-wlan.dtb \
321-
k3-am67a-kontron-sa67-base-gpios.dtb \
321+
k3-am68-phyboard-izar-lvds-ph128800t006.dtb \
322+
k3-am68-phyboard-izar-peb-av-15.dtb \
322323
k3-am68-sk-base-board-csi2-dual-imx219.dtb \
323324
k3-am68-sk-base-board-pcie1-ep.dtb \
324325
k3-am69-sk-csi2-dual-imx219.dtb \

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@
8888
AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (V3) MMC0_CMD */
8989
AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (Y1) MMC0_CLK */
9090
AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (V2) MMC0_DAT0 */
91-
AM62X_IOPAD(0x210, PIN_INPUT, 0) /* (V1) MMC0_DAT1 */
92-
AM62X_IOPAD(0x20c, PIN_INPUT, 0) /* (W2) MMC0_DAT2 */
93-
AM62X_IOPAD(0x208, PIN_INPUT, 0) /* (W1) MMC0_DAT3 */
94-
AM62X_IOPAD(0x204, PIN_INPUT, 0) /* (Y2) MMC0_DAT4 */
95-
AM62X_IOPAD(0x200, PIN_INPUT, 0) /* (W3) MMC0_DAT5 */
96-
AM62X_IOPAD(0x1fc, PIN_INPUT, 0) /* (W4) MMC0_DAT6 */
97-
AM62X_IOPAD(0x1f8, PIN_INPUT, 0) /* (V4) MMC0_DAT7 */
91+
AM62X_IOPAD(0x210, PIN_INPUT_PULLUP, 0) /* (V1) MMC0_DAT1 */
92+
AM62X_IOPAD(0x20c, PIN_INPUT_PULLUP, 0) /* (W2) MMC0_DAT2 */
93+
AM62X_IOPAD(0x208, PIN_INPUT_PULLUP, 0) /* (W1) MMC0_DAT3 */
94+
AM62X_IOPAD(0x204, PIN_INPUT_PULLUP, 0) /* (Y2) MMC0_DAT4 */
95+
AM62X_IOPAD(0x200, PIN_INPUT_PULLUP, 0) /* (W3) MMC0_DAT5 */
96+
AM62X_IOPAD(0x1fc, PIN_INPUT_PULLUP, 0) /* (W4) MMC0_DAT6 */
97+
AM62X_IOPAD(0x1f8, PIN_INPUT_PULLUP, 0) /* (V4) MMC0_DAT7 */
9898
>;
9999
};
100100

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@
3737
#size-cells = <2>;
3838
ranges;
3939

40+
linux,cma {
41+
compatible = "shared-dma-pool";
42+
reusable;
43+
size = <0x00 0x8000000>;
44+
linux,cma-default;
45+
};
46+
4047
ramoops@9c700000 {
4148
compatible = "ramoops";
4249
reg = <0x00 0x9c700000 0x00 0x00100000>;

0 commit comments

Comments
 (0)