Skip to content

Commit 2f24482

Browse files
committed
Merge tag 'soc-dt-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC devicetree updates from Arnd Bergmann: "There is new support for additional on-chip devices on Apple, Mediatek, Renesas, Rockchip, Samsung, Google, TI, ST, Nvidia and Amlogic devices. The Arm Morello reference platform gets a devicetree for booting in normal aarch64 mode. The hardware supports experimental CHERI support, which requires a modified kernel. The AMD (formerly Xilinx) Versal NET SoC gets added, this is a combined FPGA with Cortex-A78 CPUs in a SoC. Six new ST STM32MP2 SoC variants are added. Like the earlier STM32MP25, the MP211, MP213, MP215, MP231, MP233 and MP235 models are based on one or two Cortex-A35 cores but each feature a different set of I/O devices. Mediatek MT8370 is a minor variation of MT8390 with fewer CPU and GPU cores Apple T2 is the baseboard management controller on earlier Intel CPU based Macs, with 16 models now gaining initial support. All the above come with dts files for the reference boards. In addition, these boards are added for the SoCs that are already supported: - The Milk-V Jupiter board based on SpacemiT K1/M1 - NetCube Systems Kumquat board based on the 32-bit Allwinner V3s SoC - Three boards based on 32-bit stm32mp1 - 11 distinct board variants from Toradex and one from Variscite, all based on i.MX6 - Google Pixel Pro 6 phone based on gs101 (Tensor) - Three additional variants of the i.MX8MP based "Skov" board - A second variant of the i.MX95 EVK board - Two boards based on Renesas SoCs - Four boards based the Rockchip RK35xx series, plus the RK3588 'MNT Reform 2' laptop" * tag 'soc-dt-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (538 commits) arm64: dts: Add gpio_intc node for Amlogic A5 SoCs arm64: dts: Add gpio_intc node for Amlogic A4 SoCs arm64: dts: hi3660: Add property for fixing CPUIdle arm64: dts: rockchip: remove ethm0_clk0_25m_out from Sige5 gmac0 arm64: dts: marvell: Use preferred node names for "simple-bus" arm64: dts: marvell: Drop unused CP11X_TYPE define arm64: dts: marvell: Move arch timer and pmu nodes to top-level arm64: dts: rockchip: Fix PWM pinctrl names arm64: dts: rockchip: fix RK3576 SCMI clock IDs dt-bindings: clock: rk3576: add SCMI clocks arm64: dts: rockchip: Fix pcie reset gpio on Orange Pi 5 Max arm64: dts: amd/seattle: Drop undocumented "spi-controller" properties arm64: dts: amd/seattle: Fix bus, mmc, and ethernet node names arm64: dts: amd/seattle: Move and simplify fixed clocks arm64: dts: amd/seattle: Base Overdrive B1 on top of B0 version arm64: dts: rockchip: Enable HDMI audio output for ArmSoM Sige7 arm64: dts: rockchip: Enable onboard eMMC on Radxa E20C arm64: dts: rockchip: Add SDHCI controller for RK3528 arm64: dts: rockchip: Remove bluetooth node from rock-3a arm64: dts: rockchip: Move rk356x scmi SHMEM to reserved memory ...
2 parents 1a9239b + b82310b commit 2f24482

646 files changed

Lines changed: 35688 additions & 2992 deletions

File tree

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/apple.yaml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,25 @@ description: |
5757
- iPad Pro (2nd Generation) (10.5 Inch)
5858
- iPad Pro (2nd Generation) (12.9 Inch)
5959
60+
Devices based on the "T2" SoC:
61+
62+
- Apple T2 MacBookPro15,2 (j132)
63+
- Apple T2 iMacPro1,1 (j137)
64+
- Apple T2 MacBookAir8,2 (j140a)
65+
- Apple T2 MacBookAir8,1 (j140k)
66+
- Apple T2 MacBookPro16,1 (j152f)
67+
- Apple T2 MacPro7,1 (j160)
68+
- Apple T2 Macmini8,1 (j174)
69+
- Apple T2 iMac20,1 (j185)
70+
- Apple T2 iMac20,2 (j185f)
71+
- Apple T2 MacBookPro15,4 (j213)
72+
- Apple T2 MacBookPro16,2 (j214k)
73+
- Apple T2 MacBookPro16,4 (j215)
74+
- Apple T2 MacBookPro16,3 (j223)
75+
- Apple T2 MacBookAir9,1 (j230k)
76+
- Apple T2 MacBookPro15,1 (j680)
77+
- Apple T2 MacBookPro15,3 (j780)
78+
6079
Devices based on the "A11" SoC:
6180
6281
- iPhone 8
@@ -211,6 +230,28 @@ properties:
211230
- const: apple,t8011
212231
- const: apple,arm-platform
213232

233+
- description: Apple T2 SoC based platforms
234+
items:
235+
- enum:
236+
- apple,j132 # Apple T2 MacBookPro15,2 (j132)
237+
- apple,j137 # Apple T2 iMacPro1,1 (j137)
238+
- apple,j140a # Apple T2 MacBookAir8,2 (j140a)
239+
- apple,j140k # Apple T2 MacBookAir8,1 (j140k)
240+
- apple,j152f # Apple T2 MacBookPro16,1 (j152f)
241+
- apple,j160 # Apple T2 MacPro7,1 (j160)
242+
- apple,j174 # Apple T2 Macmini8,1 (j174)
243+
- apple,j185 # Apple T2 iMac20,1 (j185)
244+
- apple,j185f # Apple T2 iMac20,2 (j185f)
245+
- apple,j213 # Apple T2 MacBookPro15,4 (j213)
246+
- apple,j214k # Apple T2 MacBookPro16,2 (j214k)
247+
- apple,j215 # Apple T2 MacBookPro16,4 (j215)
248+
- apple,j223 # Apple T2 MacBookPro16,3 (j223)
249+
- apple,j230k # Apple T2 MacBookAir9,1 (j230k)
250+
- apple,j680 # Apple T2 MacBookPro15,1 (j680)
251+
- apple,j780 # Apple T2 MacBookPro15,3 (j780)
252+
- const: apple,t8012
253+
- const: apple,arm-platform
254+
214255
- description: Apple A11 SoC based platforms
215256
items:
216257
- enum:

Documentation/devicetree/bindings/arm/apple/apple,pmgr.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ properties:
2222
compatible:
2323
items:
2424
- enum:
25+
- apple,s5l8960x-pmgr
26+
- apple,t7000-pmgr
27+
- apple,s8000-pmgr
28+
- apple,t8010-pmgr
29+
- apple,t8015-pmgr
2530
- apple,t8103-pmgr
2631
- apple,t8112-pmgr
2732
- apple,t6000-pmgr
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/arm,morello.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: ARM Morello Platforms
8+
9+
maintainers:
10+
- Vincenzo Frascino <vincenzo.frascino@arm.com>
11+
12+
description: |+
13+
The Morello architecture is an experimental extension to Armv8.2-A,
14+
which extends the AArch64 state with the principles proposed in
15+
version 7 of the Capability Hardware Enhanced RISC Instructions
16+
(CHERI) ISA.
17+
18+
ARM's Morello Platforms are built as a research project to explore
19+
capability architectures based on arm.
20+
21+
properties:
22+
$nodename:
23+
const: '/'
24+
compatible:
25+
oneOf:
26+
- description: Arm Morello System Platforms
27+
items:
28+
- enum:
29+
- arm,morello-sdp
30+
- arm,morello-fvp
31+
- const: arm,morello
32+
33+
additionalProperties: true
34+
35+
...

Documentation/devicetree/bindings/arm/cpus.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ properties:
177177
- arm,neoverse-v2
178178
- arm,neoverse-v3
179179
- arm,neoverse-v3ae
180+
- arm,rainier
180181
- brcm,brahma-b15
181182
- brcm,brahma-b53
182183
- brcm,vulcan

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ properties:
9797
- i2se,duckbill
9898
- i2se,duckbill-2
9999
- karo,tx28 # Ka-Ro electronics TX28 module
100+
- lwn,imx28-btt3
100101
- lwn,imx28-xea
101102
- msr,m28cu3 # M28 SoM with custom base board
102103
- schulercontrol,imx28-sps1
@@ -296,7 +297,6 @@ properties:
296297
- technexion,imx6q-pico-pi # TechNexion i.MX6Q Pico-Pi
297298
- technologic,imx6q-ts4900
298299
- technologic,imx6q-ts7970
299-
- toradex,apalis_imx6q # Apalis iMX6 Modules
300300
- udoo,imx6q-udoo # Udoo i.MX6 Quad Board
301301
- uniwest,imx6q-evi # Uniwest Evi
302302
- variscite,dt6customboard
@@ -490,7 +490,6 @@ properties:
490490
- technexion,imx6dl-pico-pi # TechNexion i.MX6DL Pico-Pi
491491
- technologic,imx6dl-ts4900
492492
- technologic,imx6dl-ts7970
493-
- toradex,colibri_imx6dl # Colibri iMX6 Modules
494493
- udoo,imx6dl-udoo # Udoo i.MX6 Dual-lite Board
495494
- vdl,lanmcu # Van der Laan LANMCU board
496495
- wand,imx6dl-wandboard # Wandboard i.MX6 Dual Lite Board
@@ -688,6 +687,12 @@ properties:
688687
- const: phytec,imx6ul-pcl063 # PHYTEC phyCORE-i.MX 6UL
689688
- const: fsl,imx6ul
690689

690+
- description: i.MX6UL Variscite VAR-SOM-MX6 Boards
691+
items:
692+
- const: variscite,mx6ulconcerto
693+
- const: variscite,var-som-imx6ul
694+
- const: fsl,imx6ul
695+
691696
- description: Kontron BL i.MX6UL (N631X S) Board
692697
items:
693698
- const: kontron,bl-imx6ul # Kontron BL i.MX6UL Carrier Board
@@ -730,9 +735,6 @@ properties:
730735
- joz,jozacp # JOZ Access Point
731736
- kontron,sl-imx6ull # Kontron SL i.MX6ULL SoM
732737
- myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board
733-
- toradex,colibri-imx6ull # Colibri iMX6ULL Modules
734-
- toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (eMMC) Module
735-
- toradex,colibri-imx6ull-wifi # Colibri iMX6ULL Wi-Fi / BT Modules
736738
- uni-t,uti260b # UNI-T UTi260B Thermal Camera
737739
- const: fsl,imx6ull
738740

@@ -891,8 +893,6 @@ properties:
891893
- technexion,imx7d-pico-hobbit # TechNexion i.MX7D Pico-Hobbit
892894
- technexion,imx7d-pico-nymph # TechNexion i.MX7D Pico-Nymph
893895
- technexion,imx7d-pico-pi # TechNexion i.MX7D Pico-Pi
894-
- toradex,colibri-imx7d # Colibri iMX7D Module
895-
- toradex,colibri-imx7d-emmc # Colibri iMX7D 1GB (eMMC) Module
896896
- zii,imx7d-rmu2 # ZII RMU2 Board
897897
- zii,imx7d-rpu2 # ZII RPU2 Board
898898
- const: fsl,imx7d
@@ -962,9 +962,6 @@ properties:
962962
- innocomm,wb15-evk # i.MX8MM Innocomm EVK board with WB15 SoM
963963
- kontron,imx8mm-sl # i.MX8MM Kontron SL (N801X) SOM
964964
- kontron,imx8mm-osm-s # i.MX8MM Kontron OSM-S (N802X) SOM
965-
- toradex,verdin-imx8mm # Verdin iMX8M Mini Modules
966-
- toradex,verdin-imx8mm-nonwifi # Verdin iMX8M Mini Modules without Wi-Fi / BT
967-
- toradex,verdin-imx8mm-wifi # Verdin iMX8M Mini Wi-Fi / BT Modules
968965
- prt,prt8mm # i.MX8MM Protonic PRT8MM Board
969966
- const: fsl,imx8mm
970967

@@ -1098,12 +1095,12 @@ properties:
10981095
- gateworks,imx8mp-gw74xx # i.MX8MP Gateworks Board
10991096
- gateworks,imx8mp-gw75xx-2x # i.MX8MP Gateworks Board
11001097
- gateworks,imx8mp-gw82xx-2x # i.MX8MP Gateworks Board
1098+
- skov,imx8mp-skov-basic # SKOV i.MX8MP baseboard without frontplate
11011099
- skov,imx8mp-skov-revb-hdmi # SKOV i.MX8MP climate control without panel
11021100
- skov,imx8mp-skov-revb-lt6 # SKOV i.MX8MP climate control with 7” panel
11031101
- skov,imx8mp-skov-revb-mi1010ait-1cp1 # SKOV i.MX8MP climate control with 10.1" panel
1104-
- toradex,verdin-imx8mp # Verdin iMX8M Plus Modules
1105-
- toradex,verdin-imx8mp-nonwifi # Verdin iMX8M Plus Modules without Wi-Fi / BT
1106-
- toradex,verdin-imx8mp-wifi # Verdin iMX8M Plus Wi-Fi / BT Modules
1102+
- skov,imx8mp-skov-revc-bd500 # SKOV i.MX8MP climate control with LED frontplate
1103+
- skov,imx8mp-skov-revc-tian-g07017 # SKOV i.MX8MP climate control with 7" panel
11071104
- ysoft,imx8mp-iota2-lumpy # Y Soft i.MX8MP IOTA2 Lumpy Board
11081105
- const: fsl,imx8mp
11091106

@@ -1273,8 +1270,6 @@ properties:
12731270
- enum:
12741271
- fsl,imx8qm-mek # i.MX8QM MEK Board
12751272
- fsl,imx8qm-mek-revd # i.MX8QM MEK Rev D Board
1276-
- toradex,apalis-imx8 # Apalis iMX8 Modules
1277-
- toradex,apalis-imx8-v1.1 # Apalis iMX8 V1.1 Modules
12781273
- const: fsl,imx8qm
12791274

12801275
- description: i.MX8QM Boards with Toradex Apalis iMX8 Modules
@@ -1355,6 +1350,7 @@ properties:
13551350
- description: i.MX95 based Boards
13561351
items:
13571352
- enum:
1353+
- fsl,imx95-15x15-evk # i.MX95 15x15 EVK Board
13581354
- fsl,imx95-19x19-evk # i.MX95 19x19 EVK Board
13591355
- const: fsl,imx95
13601356

@@ -1435,7 +1431,6 @@ properties:
14351431
- fsl,vf610-twr # VF610 Tower Board
14361432
- lwn,bk4 # Liebherr BK4 controller
14371433
- phytec,vf610-cosmic # PHYTEC Cosmic/Cosmic+ Board
1438-
- toradex,vf610-colibri_vf61 # Colibri VF61 Modules
14391434
- const: fsl,vf610
14401435

14411436
- description: Toradex Colibri VF61 Module on Colibri Evaluation Board

Documentation/devicetree/bindings/arm/google.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ properties:
3434
const: '/'
3535
compatible:
3636
oneOf:
37-
- description: Google Pixel 6 / Oriole
37+
- description: Google Pixel 6 or 6 Pro (Oriole or Raven)
3838
items:
3939
- enum:
4040
- google,gs101-oriole
41+
- google,gs101-raven
4142
- const: google,gs101
4243

4344
# Bootloader requires empty ect node to be present

Documentation/devicetree/bindings/arm/marvell/armada-37xx.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
items:
1919
- enum:
2020
- cznic,turris-mox
21+
- glinet,gl-mv1000
2122
- globalscale,espressobin
2223
- marvell,armada-3720-db
2324
- methode,edpu

Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ properties:
2323

2424
- description: Armada 7040 SoC
2525
items:
26+
- enum:
27+
- globalscale,mochabin
28+
- marvell,armada7040-db
2629
- const: marvell,armada7040
2730
- const: marvell,armada-ap806-quad
2831
- const: marvell,armada-ap806
@@ -35,10 +38,32 @@ properties:
3538

3639
- description: Armada 8040 SoC
3740
items:
41+
- enum:
42+
- iei,puzzle-m801
43+
- marvell,armada8040-db
44+
- solidrun,clearfog-gt-8k
3845
- const: marvell,armada8040
3946
- const: marvell,armada-ap806-quad
4047
- const: marvell,armada-ap806
4148

49+
- description: Armada 8040 SoC MACCHIATOBin Boards
50+
items:
51+
- enum:
52+
- marvell,armada8040-mcbin-doubleshot
53+
- marvell,armada8040-mcbin-singleshot
54+
- const: marvell,armada8040-mcbin
55+
- const: marvell,armada8040
56+
- const: marvell,armada-ap806-quad
57+
- const: marvell,armada-ap806
58+
59+
- description: Armada 8080 SoC
60+
items:
61+
- enum:
62+
- marvell,armada-8080-db
63+
- const: marvell,armada-8080
64+
- const: marvell,armada-ap810-octa
65+
- const: marvell,armada-ap810
66+
4267
- description: Armada CN9130 SoC with no external CP
4368
items:
4469
- const: marvell,cn9130

Documentation/devicetree/bindings/arm/marvell/armada-8kp.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

Documentation/devicetree/bindings/arm/mediatek.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,11 @@ properties:
412412
- enum:
413413
- mediatek,mt8365-evk
414414
- const: mediatek,mt8365
415+
- items:
416+
- enum:
417+
- mediatek,mt8370-evk
418+
- const: mediatek,mt8370
419+
- const: mediatek,mt8188
415420
- items:
416421
- enum:
417422
- mediatek,mt8390-evk

0 commit comments

Comments
 (0)