Skip to content

Commit aca48b2

Browse files
committed
Merge tag 'dt-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC devicetree updates from Arnd Bergmann: "As usual, this is the bulk of the updates for the SoC tree, adding more devices to existing files, addressing issues from ever improving automated checking, and fixing minor issues. The most interesting bits as usual are the new platforms. All the newly supported SoCs belong into existing families this time: - Qualcomm gets support for two newly announced platforms, both of which can now work in production environments: the SDX65 5G modem that can run a minimal Linux on its Cortex-A7 core, and the Snapdragon 8 Gen 1, their latest high-end phone SoC. - Renesas adds support for R-Car S4-8, the most recent automotive Server/Communication SoC. - TI adds support for J721s2, a new automotive SoC in the K3 family. - Mediatek MT7986a/b is a SoC used in Wifi routers, the latest generation following their popular MT76xx series. Only basic support is added for now. - NXP i.MX8 ULP8 is a new low-power variant of the widespread i.MX8 series. - TI SPEAr320s is a minor variant of the old SPEAr320 SoC that we have supported for a long time. New boards with the existing SoCs include - Aspeed AST2500/AST2600 BMCs in TYAN, Facebook and Yadro servers - AT91/SAMA5 based evaluation board - NXP gains twenty new development and industrial boards for their i.MX and Layerscape SoCs - Intel IXP4xx now supports the final two machines in device tree that were previously only supported in old style board files. - Mediatek MT6589 is used in the Fairphone FP1 phone from 2013, while MT8183 is used in the Acer Chromebook 314. - Qualcomm gains support for the reference machines using the two new SoCs, plus a number of Chromebook variants and phones based on the Snapdragon 7c, 845 and 888 SoCs, including various Sony Xperia devices and the Microsoft Surface Duo 2. - ST STM32 now supports the Engicam i.Core STM32MP1 carrier board. - Tegra now boots various older Android devices based on 32-bit chips out of the box, including a number of ASUS Transformer tablets. There is also a new Jetson AGX Orin developer kit. - Apple support adds the missing device trees for all the remaining M1 Macbook and iMac variants, though not yet the M1 Pro/Max versions. - Allwinner now supports another version of the Tanix TX6 set-top box based on the H6 SoC. - Broadcom gains support for the Netgear RAXE500 Wireless router based on BCM4908" * tag 'dt-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (574 commits) Revert "ARM: dts: BCM5301X: define RTL8365MB switch on Asus RT-AC88U" arm64: dts: qcom: sm6125: Avoid using missing SM6125_VDDCX arm64: dts: qcom: sm8450-qrd: Enable USB nodes arm64: dts: qcom: sm8450: Add usb nodes ARM: dts: aspeed: add LCLK setting into LPC KCS nodes dt-bindings: ipmi: bt-bmc: add 'clocks' as a required property ARM: dts: aspeed: add LCLK setting into LPC IBT node ARM: dts: aspeed: p10: Add TPM device ARM: dts: aspeed: p10: Enable USB host ports ARM: dts: aspeed: Add TYAN S8036 BMC machine ARM: dts: aspeed: tyan-s7106: Add uart_routing and fix vuart config ARM: dts: aspeed: Adding Facebook Bletchley BMC ARM: dts: aspeed: g220a: Enable secondary flash ARM: dts: Add openbmc-flash-layout-64-alt.dtsi ARM: dts: aspeed: Add secure boot controller node dt-bindings: aspeed: Add Secure Boot Controller bindings ARM: dts: Remove "spidev" nodes dt-bindings: pinctrl: samsung: Add pin drive definitions for Exynos850 dt-bindings: arm: samsung: Document E850-96 board binding dt-bindings: Add vendor prefix for WinLink ...
2 parents e85195d + 8b0c59c commit aca48b2

555 files changed

Lines changed: 55046 additions & 14844 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: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,19 @@ maintainers:
1212
description: |
1313
ARM platforms using SoCs designed by Apple Inc., branded "Apple Silicon".
1414
15-
This currently includes devices based on the "M1" SoC, starting with the
16-
three Mac models released in late 2020:
15+
This currently includes devices based on the "M1" SoC:
1716
1817
- Mac mini (M1, 2020)
1918
- MacBook Pro (13-inch, M1, 2020)
2019
- MacBook Air (M1, 2020)
20+
- iMac (24-inch, M1, 2021)
21+
22+
And devices based on the "M1 Pro" and "M1 Max" SoCs:
23+
24+
- MacBook Pro (14-inch, M1 Pro, 2021)
25+
- MacBook Pro (14-inch, M1 Max, 2021)
26+
- MacBook Pro (16-inch, M1 Pro, 2021)
27+
- MacBook Pro (16-inch, M1 Max, 2021)
2128
2229
The compatible property should follow this format:
2330
@@ -56,8 +63,24 @@ properties:
5663
- apple,j274 # Mac mini (M1, 2020)
5764
- apple,j293 # MacBook Pro (13-inch, M1, 2020)
5865
- apple,j313 # MacBook Air (M1, 2020)
66+
- apple,j456 # iMac (24-inch, 4x USB-C, M1, 2021)
67+
- apple,j457 # iMac (24-inch, 2x USB-C, M1, 2021)
5968
- const: apple,t8103
6069
- const: apple,arm-platform
70+
- description: Apple M1 Pro SoC based platforms
71+
items:
72+
- enum:
73+
- apple,j314s # MacBook Pro (14-inch, M1 Pro, 2021)
74+
- apple,j316s # MacBook Pro (16-inch, M1 Pro, 2021)
75+
- const: apple,t6000
76+
- const: apple,arm-platform
77+
- description: Apple M1 Max SoC based platforms
78+
items:
79+
- enum:
80+
- apple,j314c # MacBook Pro (14-inch, M1 Max, 2021)
81+
- apple,j316c # MacBook Pro (16-inch, M1 Max, 2021)
82+
- const: apple,t6001
83+
- const: apple,arm-platform
6184

6285
additionalProperties: true
6386

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/apple/apple,pmgr.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Apple SoC Power Manager (PMGR)
8+
9+
maintainers:
10+
- Hector Martin <marcan@marcan.st>
11+
12+
description: |
13+
Apple SoCs include PMGR blocks responsible for power management,
14+
which can control various clocks, resets, power states, and
15+
performance features. This node represents the PMGR as a syscon,
16+
with sub-nodes representing individual features.
17+
18+
properties:
19+
$nodename:
20+
pattern: "^power-management@[0-9a-f]+$"
21+
22+
compatible:
23+
items:
24+
- enum:
25+
- apple,t8103-pmgr
26+
- apple,t6000-pmgr
27+
- const: apple,pmgr
28+
- const: syscon
29+
- const: simple-mfd
30+
31+
reg:
32+
maxItems: 1
33+
34+
"#address-cells":
35+
const: 1
36+
37+
"#size-cells":
38+
const: 1
39+
40+
patternProperties:
41+
"power-controller@[0-9a-f]+$":
42+
description:
43+
The individual power management domains within this controller
44+
type: object
45+
$ref: /power/apple,pmgr-pwrstate.yaml#
46+
47+
required:
48+
- compatible
49+
- reg
50+
51+
additionalProperties: false
52+
53+
examples:
54+
- |
55+
soc {
56+
#address-cells = <2>;
57+
#size-cells = <2>;
58+
59+
power-management@23b700000 {
60+
compatible = "apple,t8103-pmgr", "apple,pmgr", "syscon", "simple-mfd";
61+
#address-cells = <1>;
62+
#size-cells = <1>;
63+
reg = <0x2 0x3b700000 0x0 0x14000>;
64+
65+
ps_sio: power-controller@1c0 {
66+
compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";
67+
reg = <0x1c0 8>;
68+
#power-domain-cells = <0>;
69+
#reset-cells = <0>;
70+
label = "sio";
71+
apple,always-on;
72+
};
73+
74+
ps_uart_p: power-controller@220 {
75+
compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";
76+
reg = <0x220 8>;
77+
#power-domain-cells = <0>;
78+
#reset-cells = <0>;
79+
label = "uart_p";
80+
power-domains = <&ps_sio>;
81+
};
82+
83+
ps_uart0: power-controller@270 {
84+
compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";
85+
reg = <0x270 8>;
86+
#power-domain-cells = <0>;
87+
#reset-cells = <0>;
88+
label = "uart0";
89+
power-domains = <&ps_uart_p>;
90+
};
91+
};
92+
93+
power-management@23d280000 {
94+
compatible = "apple,t8103-pmgr", "apple,pmgr", "syscon", "simple-mfd";
95+
#address-cells = <1>;
96+
#size-cells = <1>;
97+
reg = <0x2 0x3d280000 0x0 0xc000>;
98+
99+
ps_aop_filter: power-controller@4000 {
100+
compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";
101+
reg = <0x4000 8>;
102+
#power-domain-cells = <0>;
103+
#reset-cells = <0>;
104+
label = "aop_filter";
105+
};
106+
107+
ps_aop_base: power-controller@4010 {
108+
compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";
109+
reg = <0x4010 8>;
110+
#power-domain-cells = <0>;
111+
#reset-cells = <0>;
112+
label = "aop_base";
113+
power-domains = <&ps_aop_filter>;
114+
};
115+
116+
ps_aop_shim: power-controller@4038 {
117+
compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";
118+
reg = <0x4038 8>;
119+
#power-domain-cells = <0>;
120+
#reset-cells = <0>;
121+
label = "aop_shim";
122+
power-domains = <&ps_aop_base>;
123+
};
124+
125+
ps_aop_uart0: power-controller@4048 {
126+
compatible = "apple,t8103-pmgr-pwrstate", "apple,pmgr-pwrstate";
127+
reg = <0x4048 8>;
128+
#power-domain-cells = <0>;
129+
#reset-cells = <0>;
130+
label = "aop_uart0";
131+
power-domains = <&ps_aop_shim>;
132+
};
133+
};
134+
};
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
2+
# Copyright 2021 Joel Stanley, IBM Corp.
3+
%YAML 1.2
4+
---
5+
$id: "http://devicetree.org/schemas/arm/aspeed/aspeed,sbc.yaml#"
6+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
7+
8+
title: ASPEED Secure Boot Controller
9+
10+
maintainers:
11+
- Joel Stanley <joel@jms.id.au>
12+
- Andrew Jeffery <andrew@aj.id.au>
13+
14+
description: |
15+
The ASPEED SoCs have a register bank for interacting with the secure boot
16+
controller.
17+
18+
properties:
19+
compatible:
20+
items:
21+
- const: aspeed,ast2600-sbc
22+
23+
reg:
24+
maxItems: 1
25+
26+
required:
27+
- compatible
28+
- reg
29+
30+
additionalProperties: false
31+
32+
examples:
33+
- |
34+
sbc: secure-boot-controller@1e6f2000 {
35+
compatible = "aspeed,ast2600-sbc";
36+
reg = <0x1e6f2000 0x1000>;
37+
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
items:
3030
- enum:
3131
- asus,gt-ac5300
32+
- netgear,raxe500
3233
- const: brcm,bcm4908
3334

3435
- description: BCM49408 based boards

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ properties:
240240
- uniwest,imx6q-evi # Uniwest Evi
241241
- variscite,dt6customboard
242242
- wand,imx6q-wandboard # Wandboard i.MX6 Quad Board
243+
- ysoft,imx6q-yapp4-crux # i.MX6 Quad Y Soft IOTA Crux board
243244
- zealz,imx6q-gk802 # Zealz GK802
244245
- zii,imx6q-zii-rdu2 # ZII RDU2 Board
245246
- const: fsl,imx6q
@@ -323,6 +324,20 @@ properties:
323324
- const: toradex,apalis_imx6q
324325
- const: fsl,imx6q
325326

327+
- description: TQ-Systems TQMa6Q SoM (variant A) on MBa6x
328+
items:
329+
- const: tq,imx6q-mba6x-a
330+
- const: tq,mba6a # Expected by bootloader, to be removed in the future
331+
- const: tq,imx6q-tqma6q-a
332+
- const: fsl,imx6q
333+
334+
- description: TQ-Systems TQMa6Q SoM (variant B) on MBa6x
335+
items:
336+
- const: tq,imx6q-mba6x-b
337+
- const: tq,mba6b # Expected by bootloader, to be removed in the future
338+
- const: tq,imx6q-tqma6q-b
339+
- const: fsl,imx6q
340+
326341
- description: i.MX6QP based Boards
327342
items:
328343
- enum:
@@ -334,6 +349,7 @@ properties:
334349
- kvg,vicutp # Kverneland UT1P board
335350
- prt,prtwd3 # Protonic WD3 board
336351
- wand,imx6qp-wandboard # Wandboard i.MX6 QuadPlus Board
352+
- ysoft,imx6qp-yapp4-crux-plus # i.MX6 Quad Plus Y Soft IOTA Crux+ board
337353
- zii,imx6qp-zii-rdu2 # ZII RDU2+ Board
338354
- const: fsl,imx6qp
339355

@@ -344,6 +360,13 @@ properties:
344360
- const: phytec,imx6qdl-pcm058 # PHYTEC phyCORE-i.MX6
345361
- const: fsl,imx6qp
346362

363+
- description: TQ-Systems TQMa6QP SoM on MBa6x
364+
items:
365+
- const: tq,imx6qp-mba6x-b
366+
- const: tq,mba6b # Expected by bootloader, to be removed in the future
367+
- const: tq,imx6qp-tqma6qp-b
368+
- const: fsl,imx6qp
369+
347370
- description: i.MX6DL based Boards
348371
items:
349372
- enum:
@@ -482,6 +505,20 @@ properties:
482505
- const: dh,imx6s-dhcom-som
483506
- const: fsl,imx6dl
484507

508+
- description: TQ-Systems TQMa6DL SoM (variant A) on MBa6x
509+
items:
510+
- const: tq,imx6dl-mba6x-a
511+
- const: tq,mba6a # Expected by bootloader, to be removed in the future
512+
- const: tq,imx6dl-tqma6dl-a
513+
- const: fsl,imx6dl
514+
515+
- description: TQ-Systems TQMa6DL SoM (variant B) on MBa6x
516+
items:
517+
- const: tq,imx6dl-mba6x-b
518+
- const: tq,mba6b # Expected by bootloader, to be removed in the future
519+
- const: tq,imx6dl-tqma6dl-b
520+
- const: fsl,imx6dl
521+
485522
- description: i.MX6SL based Boards
486523
items:
487524
- enum:
@@ -580,6 +617,7 @@ properties:
580617
items:
581618
- enum:
582619
- fsl,imx6ull-14x14-evk # i.MX6 UltraLiteLite 14x14 EVK Board
620+
- joz,jozacp # JOZ Access Point
583621
- kontron,imx6ull-n6411-som # Kontron N6411 SOM
584622
- myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board
585623
- toradex,colibri-imx6ull # Colibri iMX6ULL Modules
@@ -632,6 +670,7 @@ properties:
632670
- description: i.MX6ULZ based Boards
633671
items:
634672
- enum:
673+
- bsh,imx6ulz-bsh-smm-m2 # i.MX6 ULZ BSH SystemMaster
635674
- fsl,imx6ulz-14x14-evk # i.MX6 ULZ 14x14 EVK Board
636675
- const: fsl,imx6ull # This seems odd. Should be last?
637676
- const: fsl,imx6ulz
@@ -754,10 +793,23 @@ properties:
754793
- const: variscite,var-som-mx8mm
755794
- const: fsl,imx8mm
756795

796+
- description:
797+
TQMa8MxML is a series of SOM featuring NXP i.MX8MM system-on-chip
798+
variants. It is designed to be soldered on different carrier boards.
799+
All variants (TQMa8M[Q,D,S][L]ML) use the same device tree, hence only
800+
one compatible is needed.
801+
items:
802+
- enum:
803+
- tq,imx8mm-tqma8mqml-mba8mx # TQ-Systems GmbH i.MX8MM TQMa8MQML SOM on MBa8Mx
804+
- const: tq,imx8mm-tqma8mqml # TQ-Systems GmbH i.MX8MM TQMa8MQML SOM
805+
- const: fsl,imx8mm
806+
757807
- description: i.MX8MN based Boards
758808
items:
759809
- enum:
760810
- beacon,imx8mn-beacon-kit # i.MX8MN Beacon Development Kit
811+
- bsh,imx8mn-bsh-smm-s2 # i.MX8MN BSH SystemMaster S2
812+
- bsh,imx8mn-bsh-smm-s2pro # i.MX8MN BSH SystemMaster S2 PRO
761813
- fsl,imx8mn-ddr4-evk # i.MX8MN DDR4 EVK Board
762814
- fsl,imx8mn-evk # i.MX8MN LPDDR4 EVK Board
763815
- gw,imx8mn-gw7902 # i.MX8MM Gateworks Board
@@ -769,6 +821,17 @@ properties:
769821
- const: variscite,var-som-mx8mn
770822
- const: fsl,imx8mn
771823

824+
- description:
825+
TQMa8MxNL is a series of SOM featuring NXP i.MX8MN system-on-chip
826+
variants. It is designed to be soldered on different carrier boards.
827+
All variants (TQMa8M[Q,D,S][L]NL) use the same device tree, hence only
828+
one compatible is needed.
829+
items:
830+
- enum:
831+
- tq,imx8mn-tqma8mqnl-mba8mx # TQ-Systems GmbH i.MX8MN TQMa8MQNL SOM on MBa8Mx
832+
- const: tq,imx8mn-tqma8mqnl # TQ-Systems GmbH i.MX8MN TQMa8MQNL SOM
833+
- const: fsl,imx8mn
834+
772835
- description: i.MX8MP based Boards
773836
items:
774837
- enum:
@@ -805,6 +868,15 @@ properties:
805868
- const: purism,librem5
806869
- const: fsl,imx8mq
807870

871+
- description:
872+
TQMa8Mx is a series of SOM featuring NXP i.MX8MQ system-on-chip
873+
variants. It is designed to be clicked on different carrier boards.
874+
items:
875+
- enum:
876+
- tq,imx8mq-tqma8mq-mba8mx # TQ-Systems GmbH i.MX8MQ TQMa8Mx SOM on MBa8Mx
877+
- const: tq,imx8mq-tqma8mq # TQ-Systems GmbH i.MX8MQ TQMa8Mx SOM
878+
- const: fsl,imx8mq
879+
808880
- description: Zodiac Inflight Innovations Ultra Boards
809881
items:
810882
- enum:
@@ -834,6 +906,12 @@ properties:
834906
- const: toradex,colibri-imx8x
835907
- const: fsl,imx8qxp
836908

909+
- description: i.MX8ULP based Boards
910+
items:
911+
- enum:
912+
- fsl,imx8ulp-evk # i.MX8ULP EVK Board
913+
- const: fsl,imx8ulp
914+
837915
- description:
838916
Freescale Vybrid Platform Device Tree Bindings
839917

0 commit comments

Comments
 (0)