Skip to content

Commit 0f048c8

Browse files
committed
Merge tag 'soc-dt-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC dt updates from Arnd Bergmann: "There are five sets of new SoCs that get added in existing families, all of them being either upgrades or cut-down versions of the older chips: - Apple M2 Pro, M2 Max and M2 Ultra, used in the 2022/2023 generation of high-end workstations and laptops from Apple. Linux has been working on these for a while but stil requires patches. - Axis Artpec8 is an Armv8 chip based on Samsung Exynos design, unlike the earlier Armv7 Artpec6 from the same company that was part of a separate family of chips. - NXP i.MX91 is a cut-down version of i.MX93, using only a single Cortex-A55 core. - Qualcomm Lemans Auto is a variant of the Lemans SoC that was originally merged under the sa8775p name, the differences being mostly the firmware configuration of the platform. - Four new Renesas SoCs RZ/T2H (r9a09g077m44), RZ/N2H (r9a09g087m44), RZ/T2H (r9a09g077), and RZ/N2H (r9a09g087) are all industrial bedded SoCs based on Cortex-A55 cores In total, there are 65 new machines, including: - Industrial embedded system and single-board computers based on NXP, Allwinner, TI, Rockchips, Marvell, Xilinx Spacemit, Starfive chips. - Reference boards for the newly added Renesas, Qualcomm, NXP and Axis ARMv8 chips as well as Microchip's MPFS RISC-V SoC - Laptops and Workstations using Apple M2 and Qualcomm Snapdragon X1 chips. - Several Samsung phones using Qualcomm Snapdragon chips - Set-top boxes based on Allwinner H313 - Five BMC boards using 32-bit ASpeed SoCs - Three network routers using IXP4xx (ARMv5!) and Broadcom bcm4708 (ARMv7) SoCs Two machines get phased out because they were available only in small quantities but never made it into products: one STi407 based reference board, and a Snapdragon 845 based Chromebook. Aside from the newly added machines, a lot of work went into improving hardware support on the existing machines and cleaning up contents for validation" * tag 'soc-dt-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (931 commits) arm64: dts: apm-shadowcat: Drop "apm,xgene2-pcie" compatible arm64: dts: apm-shadowcat: Move slimpro nodes out of "simple-bus" node ARM: dts: microchip: sam9x7: Add qspi controller arm64: dts: qcom: Add MST pixel streams for displayport arm64: dts: qcom: sm6350: correct DP compatibility strings arm64: dts: qcom: monaco-evk: Enable Adreno 623 GPU arm64: dts: qcom: qcs8300-ride: Enable Adreno 623 GPU arm64: dts: qcom: qcs8300: Add gpu and gmu nodes arm64: dts: allwinner: h313: Add Amediatech X96Q dt-bindings: arm: sunxi: Add Amediatech X96Q arm64: dts: apple: t8015: Add SPMI node arm64: dts: apple: t8012: Add SPMI node arm64: dts: apple: Add J180d (Mac Pro, M2 Ultra, 2023) device tree arm64: dts: rockchip: Add devicetree for the ROC-RK3588-RT dt-bindings: arm: rockchip: Add Firefly ROC-RK3588-RT arm64: dts: rockchip: update pinctrl names for Radxa E52C arm64: dts: rockchip: remove vcc_3v3_pmu regulator for Radxa E52C arm64: dts: apple: Add J474s, J475c and J475d device trees arm64: dts: apple: Add J414 and J416 Macbook Pro device trees arm64: dts: apple: Add initial t6020/t6021/t6022 DTs ...
2 parents a8253f8 + 8c0650e commit 0f048c8

847 files changed

Lines changed: 59965 additions & 16369 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: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,11 @@ description: |
9292
Devices based on the "M2" SoC:
9393
9494
- MacBook Air (M2, 2022)
95+
- MacBook Air (15-inch, M2, 2023)
9596
- MacBook Pro (13-inch, M2, 2022)
9697
- Mac mini (M2, 2023)
9798
98-
And devices based on the "M1 Pro", "M1 Max" and "M1 Ultra" SoCs:
99+
Devices based on the "M1 Pro", "M1 Max" and "M1 Ultra" SoCs:
99100
100101
- MacBook Pro (14-inch, M1 Pro, 2021)
101102
- MacBook Pro (14-inch, M1 Max, 2021)
@@ -104,6 +105,17 @@ description: |
104105
- Mac Studio (M1 Max, 2022)
105106
- Mac Studio (M1 Ultra, 2022)
106107
108+
Devices based on the "M2 Pro", "M2 Max" and "M2 Ultra" SoCs:
109+
110+
- MacBook Pro (14-inch, M2 Pro, 2023)
111+
- MacBook Pro (14-inch, M2 Max, 2023)
112+
- MacBook Pro (16-inch, M2 Pro, 2023)
113+
- MacBook Pro (16-inch, M2 Max, 2023)
114+
- Mac mini (M2 Pro, 2023)
115+
- Mac Studio (M2 Max, 2023)
116+
- Mac Studio (M2 Ultra, 2023)
117+
- Mac Pro (M2 Ultra, 2023)
118+
107119
The compatible property should follow this format:
108120
109121
compatible = "apple,<targettype>", "apple,<socid>", "apple,arm-platform";
@@ -279,6 +291,7 @@ properties:
279291
items:
280292
- enum:
281293
- apple,j413 # MacBook Air (M2, 2022)
294+
- apple,j415 # MacBook Air (15-inch, M2, 2023)
282295
- apple,j473 # Mac mini (M2, 2023)
283296
- apple,j493 # MacBook Pro (13-inch, M2, 2022)
284297
- const: apple,t8112
@@ -308,6 +321,32 @@ properties:
308321
- const: apple,t6002
309322
- const: apple,arm-platform
310323

324+
- description: Apple M2 Pro SoC based platforms
325+
items:
326+
- enum:
327+
- apple,j414s # MacBook Pro (14-inch, M2 Pro, 2023)
328+
- apple,j416s # MacBook Pro (16-inch, M2 Pro, 2023)
329+
- apple,j474s # Mac mini (M2 Pro, 2023)
330+
- const: apple,t6020
331+
- const: apple,arm-platform
332+
333+
- description: Apple M2 Max SoC based platforms
334+
items:
335+
- enum:
336+
- apple,j414c # MacBook Pro (14-inch, M2 Max, 2023)
337+
- apple,j416c # MacBook Pro (16-inch, M2 Max, 2023)
338+
- apple,j475c # Mac Studio (M2 Max, 2023)
339+
- const: apple,t6021
340+
- const: apple,arm-platform
341+
342+
- description: Apple M2 Ultra SoC based platforms
343+
items:
344+
- enum:
345+
- apple,j180d # Mac Pro (M2 Ultra, 2023)
346+
- apple,j475d # Mac Studio (M2 Ultra, 2023)
347+
- const: apple,t6022
348+
- const: apple,arm-platform
349+
311350
additionalProperties: true
312351

313352
...

Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ properties:
4646
- facebook,yamp-bmc
4747
- facebook,yosemitev2-bmc
4848
- facebook,wedge400-bmc
49+
- facebook,wedge400-data64-bmc
4950
- hxt,stardragon4800-rep2-bmc
5051
- ibm,mihawk-bmc
5152
- ibm,mowgli-bmc
@@ -81,9 +82,12 @@ properties:
8182
- asus,x4tf-bmc
8283
- facebook,bletchley-bmc
8384
- facebook,catalina-bmc
85+
- facebook,clemente-bmc
8486
- facebook,cloudripper-bmc
87+
- facebook,darwin-bmc
8588
- facebook,elbert-bmc
8689
- facebook,fuji-bmc
90+
- facebook,fuji-data64-bmc
8791
- facebook,greatlakes-bmc
8892
- facebook,harma-bmc
8993
- facebook,minerva-cmc

Documentation/devicetree/bindings/arm/axis.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/axis.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Axis ARTPEC platforms
8+
9+
maintainers:
10+
- Jesper Nilsson <jesper.nilsson@axis.com>
11+
- Lars Persson <lars.persson@axis.com>
12+
- linux-arm-kernel@axis.com
13+
14+
description: |
15+
ARM platforms using SoCs designed by Axis branded as "ARTPEC".
16+
17+
properties:
18+
$nodename:
19+
const: '/'
20+
compatible:
21+
oneOf:
22+
- description: Axis ARTPEC-6 SoC board
23+
items:
24+
- enum:
25+
- axis,artpec6-dev-board
26+
- const: axis,artpec6
27+
28+
- description: Axis ARTPEC-8 SoC board
29+
items:
30+
- enum:
31+
- axis,artpec8-grizzly
32+
- const: axis,artpec8
33+
34+
additionalProperties: true
35+
36+
...

Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- enum:
2626
- asus,rt-ac56u
2727
- asus,rt-ac68u
28+
- buffalo,wxr-1750dhp
2829
- buffalo,wzr-1166dhp
2930
- buffalo,wzr-1166dhp2
3031
- buffalo,wzr-1750dhp

Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ properties:
2828
reg:
2929
maxItems: 1
3030

31+
clocks:
32+
maxItems: 2
33+
34+
clock-names:
35+
items:
36+
- const: divcore
37+
- const: hsrun_divcore
38+
3139
required:
3240
- compatible
3341
- reg

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,6 +1112,7 @@ properties:
11121112
- skov,imx8mp-skov-revb-mi1010ait-1cp1 # SKOV i.MX8MP climate control with 10.1" panel
11131113
- skov,imx8mp-skov-revc-bd500 # SKOV i.MX8MP climate control with LED frontplate
11141114
- skov,imx8mp-skov-revc-tian-g07017 # SKOV i.MX8MP climate control with 7" panel
1115+
- ultratronik,imx8mp-ultra-mach-sbc # Ultratronik SBC i.MX8MP based board
11151116
- ysoft,imx8mp-iota2-lumpy # Y Soft i.MX8MP IOTA2 Lumpy Board
11161117
- const: fsl,imx8mp
11171118

@@ -1200,6 +1201,24 @@ properties:
12001201
- const: polyhex,imx8mp-debix-som-a # Polyhex Debix SOM A
12011202
- const: fsl,imx8mp
12021203

1204+
- description: SolidRun i.MX8MP SoM based boards
1205+
items:
1206+
- enum:
1207+
- solidrun,imx8mp-cubox-m # SolidRun i.MX8MP SoM on CuBox-M
1208+
- solidrun,imx8mp-hummingboard-mate # SolidRun i.MX8MP SoM on HummingBoard Mate
1209+
- solidrun,imx8mp-hummingboard-pro # SolidRun i.MX8MP SoM on HummingBoard Pro
1210+
- solidrun,imx8mp-hummingboard-pulse # SolidRun i.MX8MP SoM on HummingBoard Pulse
1211+
- solidrun,imx8mp-hummingboard-ripple # SolidRun i.MX8MP SoM on HummingBoard Ripple
1212+
- const: solidrun,imx8mp-sr-som
1213+
- const: fsl,imx8mp
1214+
1215+
- description: TechNexion EDM-G-IMX8M-PLUS SoM based boards
1216+
items:
1217+
- enum:
1218+
- technexion,edm-g-imx8mp-wb # TechNexion EDM-G-IMX8MP SOM on WB-EDM-G
1219+
- const: technexion,edm-g-imx8mp # TechNexion EDM-G-IMX8MP SOM
1220+
- const: fsl,imx8mp
1221+
12031222
- description: Toradex Boards with SMARC iMX8M Plus Modules
12041223
items:
12051224
- const: toradex,smarc-imx8mp-dev # Toradex SMARC iMX8M Plus on Toradex SMARC Development Board
@@ -1382,9 +1401,16 @@ properties:
13821401
- description: i.MX8ULP based Boards
13831402
items:
13841403
- enum:
1404+
- fsl,imx8ulp-9x9-evk # i.MX8ULP EVK9 Board
13851405
- fsl,imx8ulp-evk # i.MX8ULP EVK Board
13861406
- const: fsl,imx8ulp
13871407

1408+
- description: i.MX91 based Boards
1409+
items:
1410+
- enum:
1411+
- fsl,imx91-11x11-evk # i.MX91 11x11 EVK Board
1412+
- const: fsl,imx91
1413+
13881414
- description: i.MX93 based Boards
13891415
items:
13901416
- enum:
@@ -1425,6 +1451,24 @@ properties:
14251451
- fsl,imxrt1170-evk # i.MXRT1170 EVK Board
14261452
- const: fsl,imxrt1170
14271453

1454+
- description:
1455+
TQMa91xxLA and TQMa91xxCA are two series of feature compatible SOM
1456+
using NXP i.MX91 SOC in 11x11 mm package.
1457+
TQMa91xxLA is designed to be soldered on different carrier boards.
1458+
TQMa91xxCA is a compatible variant using board to board connectors.
1459+
All SOM and CPU variants use the same device tree hence only one
1460+
compatible is needed. Bootloader disables all features not present
1461+
in the assembled SOC.
1462+
MBa91xxCA mainboard can be used as starterkit for the SOM
1463+
soldered on an adapter board or for the connector variant
1464+
MBa91xxLA mainboard is a single board computer using the solderable
1465+
SOM variant
1466+
items:
1467+
- enum:
1468+
- tq,imx91-tqma9131-mba91xxca # TQ-Systems GmbH i.MX91 TQMa91xxCA/LA SOM on MBa91xxCA
1469+
- const: tq,imx91-tqma9131 # TQ-Systems GmbH i.MX91 TQMa91xxCA/LA SOM
1470+
- const: fsl,imx91
1471+
14281472
- description:
14291473
TQMa93xxLA and TQMa93xxCA are two series of feature compatible SOM
14301474
using NXP i.MX93 SOC in 11x11 mm package.
@@ -1537,6 +1581,12 @@ properties:
15371581
- fsl,ls1012a-qds
15381582
- const: fsl,ls1012a
15391583

1584+
- description: TQ Systems TQMLS12AL SoM on MBLS1012AL board
1585+
items:
1586+
- const: tq,ls1012a-tqmls1012al-mbls1012al
1587+
- const: tq,ls1012a-tqmls1012al
1588+
- const: fsl,ls1012a
1589+
15401590
- description: LS1021A based Boards
15411591
items:
15421592
- enum:

Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ properties:
1616
oneOf:
1717
- items:
1818
- enum:
19+
- actiontec,mi424wr-ac
20+
- actiontec,mi424wr-d
1921
- adieng,coyote
2022
- arcom,vulcan
2123
- dlink,dsm-g600-a

Documentation/devicetree/bindings/arm/keystone/keystone.txt

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323
- marvell,armada-3720-db
2424
- methode,edpu
2525
- methode,udpu
26+
- ripe,atlas-v5
2627
- const: marvell,armada3720
2728
- const: marvell,armada3710
2829

0 commit comments

Comments
 (0)