Skip to content

Commit ae45d84

Browse files
committed
Merge tag 'dt-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC DT updates from Arnd Bergmann: "This is a rather large update for the ARM devicetree files, after a few quieter releases, with 775 total commits and 47 branches pulled into this one. There are 5 new SoC types plus some minor variations, and a total of 60 new machines, so I'm limiting the summary to the main noteworthy items: - Apple M1 gain support for PCI and pinctrl, getting a bit closer to a usable system out of the box. - Qualcomm gains support for Snapdragon 690 (aka SM6350) as well as SM7225, 11 new smartphones, and three additional Chromebooks, and improvements all over the place. - Samsung gains support for ExynosAutov9, an automotive version of their smartphone SoC, but otherwise no major changes. - Microchip adds the SAMA5D29 SoC in the SAMA5 family, and a number of improvements for the recently added SAMA7 family. The LAN966 SoC that was added in the platform code does not have dts files yet. Two board files are added for the older at91sam9g20 SoC - Aspeed supports two additional server boards using their AST2600 as BMC, and improves support for qemu models - Rockchip RK3566/RK3688 gets added, along with six new development boards using RK3328/RK3399/RK3566, and one Chromebook tablet. - Two NAS boxes are added using the ARMv4 based Gemini platform - One new board is added to the Intel Arria SoC FPGA family - Marvell adds one network switch based on Armada 381 and the new MOCHAbin 7040 development board - NXP adds support for the S32G2 automotive SoC, two imx6 based ebook readers, and three additional development boards, which is notably less than their usual additions, but they also gain improvements to their many existing boards - STmicroelectronics adds their stm32mp13 SoC family along with a reference board - Renesas adds new versions of their R-Car Gen3 SoCs and many updates for their older generations - Broadcom adds support for a number of Cisco Meraki wireless controllers, along with two new boards and other updates for BCM53xx/BCM47xx networking SoCs and the Raspberry Pi boards - Mediatek improves support for the MT81xx SoCs used in Chromebooks as well as the MT76xx networking SoCs - NVIDIA adds a number of cleanups and additional support for more hardware on the already supported machines - TI K3 adds support for three new boards along with cleanups - Toshiba adds one board for the Visconti family - Xilinx adds five new ZynqMP based machines - Amlogic support is added for the Radxa Zero and two Jethub home automation controllers, along with changes to other machines - Rob Herring continues his work on fixing dtc warnings all over the tree. - Minor updates for TI OMAP, Mstar, Allwinner/sunxi, Hisilicon, Ux500, Unisoc" * tag 'dt-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (720 commits) arm64: dts: apple: j274: Expose PCI node for the Ethernet MAC address arm64: dts: apple: t8103: Add root port interrupt routing arm64: dts: apple: t8103: Add PCIe DARTs arm64: apple: Add PCIe node arm64: apple: Add pinctrl nodes ARM: dts: arm: Update ICST clock nodes 'reg' and node names ARM: dts: arm: Update register-bit-led nodes 'reg' and node names arm64: dts: exynos: add chipid node for exynosautov9 SoC ARM: dts: qcom: fix typo in IPQ8064 thermal-sensor node Revert "arm64: dts: qcom: msm8916-asus-z00l: Add sensors" arm64: dts: qcom: ipq6018: Remove unused 'iface_clk' property from dma-controller node arm64: dts: qcom: ipq6018: Remove unused 'qcom,config-pipe-trust-reg' property arm64: dts: qcom: sm8350: Add CPU topology and idle-states arm64: dts: qcom: Drop unneeded extra device-specific includes arm64: dts: qcom: msm8916: Drop standalone smem node arm64: dts: qcom: Fix node name of rpm-msg-ram device nodes arm64: dts: qcom: msm8916-asus-z00l: Add sensors arm64: dts: qcom: msm8916-asus-z00l: Add SDCard arm64: dts: qcom: msm8916-asus-z00l: Add touchscreen arm64: dts: qcom: sdm845-oneplus: remove devinfo-size from ramoops node ...
2 parents 2219b0c + c17c7cc commit ae45d84

File tree

706 files changed

+49099
-9322
lines changed

Some content is hidden

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

706 files changed

+49099
-9322
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ Nicolas Pitre <[email protected]> <[email protected]>
279279
280280
Nicolas Saenz Julienne <[email protected]> <[email protected]>
281281
Nicolas Saenz Julienne <[email protected]> <[email protected]>
282+
Niklas Söderlund <[email protected]>
282283
283284
284285

Documentation/devicetree/bindings/arm/amlogic.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ properties:
8686
- enum:
8787
- amlogic,p281
8888
- oranth,tx3-mini
89+
- jethome,jethub-j80
8990
- const: amlogic,s905w
9091
- const: amlogic,meson-gxl
9192

@@ -133,6 +134,7 @@ properties:
133134
items:
134135
- enum:
135136
- amlogic,s400
137+
- jethome,jethub-j100
136138
- const: amlogic,a113d
137139
- const: amlogic,meson-axg
138140

@@ -141,6 +143,7 @@ properties:
141143
- enum:
142144
- amediatech,x96-max
143145
- amlogic,u200
146+
- radxa,zero
144147
- seirobotics,sei510
145148
- const: amlogic,g12a
146149

Documentation/devicetree/bindings/arm/atmel-at91.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,18 @@ properties:
126126
- const: atmel,sama5d3
127127
- const: atmel,sama5
128128

129+
- description: CalAmp LMU5000 board
130+
items:
131+
- const: calamp,lmu5000
132+
- const: atmel,at91sam9g20
133+
- const: atmel,at91sam9
134+
135+
- description: Exegin Q5xR5 board
136+
items:
137+
- const: exegin,q5xr5
138+
- const: atmel,at91sam9g20
139+
- const: atmel,at91sam9
140+
129141
- items:
130142
- enum:
131143
- atmel,sama5d31

Documentation/devicetree/bindings/arm/bcm/bcm2835.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
items:
2020
- enum:
2121
- raspberrypi,400
22+
- raspberrypi,4-compute-module
2223
- raspberrypi,4-model-b
2324
- const: brcm,bcm2711
2425

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

Lines changed: 55 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,61 @@ properties:
2222
$nodename:
2323
const: '/'
2424
compatible:
25-
items:
26-
- enum:
27-
- brcm,bcm58522
28-
- brcm,bcm58525
29-
- brcm,bcm58535
30-
- brcm,bcm58622
31-
- brcm,bcm58623
32-
- brcm,bcm58625
33-
- brcm,bcm88312
34-
- const: brcm,nsp
25+
oneOf:
26+
- description: BCM58522 based boards
27+
items:
28+
- enum:
29+
- brcm,bcm958522er
30+
- const: brcm,bcm58522
31+
- const: brcm,nsp
32+
33+
- description: BCM58525 based boards
34+
items:
35+
- enum:
36+
- brcm,bcm958525er
37+
- brcm,bcm958525xmc
38+
- const: brcm,bcm58525
39+
- const: brcm,nsp
40+
41+
- description: BCM58535 based boards
42+
items:
43+
- const: brcm,bcm58535
44+
- const: brcm,nsp
45+
46+
- description: BCM58622 based boards
47+
items:
48+
- enum:
49+
- brcm,bcm958622hr
50+
- const: brcm,bcm58622
51+
- const: brcm,nsp
52+
53+
- description: BCM58623 based boards
54+
items:
55+
- enum:
56+
- brcm,bcm958623hr
57+
- const: brcm,bcm58623
58+
- const: brcm,nsp
59+
60+
- description: BCM58625 based boards
61+
items:
62+
- enum:
63+
- brcm,bcm958625hr
64+
- brcm,bcm958625k
65+
- meraki,mx64
66+
- meraki,mx64-a0
67+
- meraki,mx64w
68+
- meraki,mx64w-a0
69+
- meraki,mx65
70+
- meraki,mx65w
71+
- const: brcm,bcm58625
72+
- const: brcm,nsp
73+
74+
- description: BCM88312 based boards
75+
items:
76+
- enum:
77+
- brcm,bcm988312hr
78+
- const: brcm,bcm88312
79+
- const: brcm,nsp
3580

3681
additionalProperties: true
3782

Documentation/devicetree/bindings/arm/cpus.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ properties:
171171
- qcom,kryo385
172172
- qcom,kryo468
173173
- qcom,kryo485
174+
- qcom,kryo560
175+
- qcom,kryo570
174176
- qcom,kryo685
175177
- qcom,scorpion
176178

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 61 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ properties:
235235
- technexion,imx6q-pico-pi # TechNexion i.MX6Q Pico-Pi
236236
- technologic,imx6q-ts4900
237237
- technologic,imx6q-ts7970
238-
- toradex,apalis_imx6q # Apalis iMX6 Module
238+
- toradex,apalis_imx6q # Apalis iMX6 Modules
239239
- udoo,imx6q-udoo # Udoo i.MX6 Quad Board
240240
- uniwest,imx6q-evi # Uniwest Evi
241241
- variscite,dt6customboard
@@ -314,18 +314,12 @@ properties:
314314
- const: phytec,imx6q-pfla02 # PHYTEC phyFLEX-i.MX6 Quad
315315
- const: fsl,imx6q
316316

317-
- description: i.MX6Q Boards with Toradex Apalis iMX6Q/D Module
317+
- description: i.MX6Q Boards with Toradex Apalis iMX6Q/D Modules
318318
items:
319319
- enum:
320-
- toradex,apalis_imx6q-ixora # Apalis iMX6Q/D Module on Ixora Carrier Board
321-
- toradex,apalis_imx6q-eval # Apalis iMX6Q/D Module on Apalis Evaluation Board
322-
- const: toradex,apalis_imx6q
323-
- const: fsl,imx6q
324-
325-
- description: i.MX6Q Toradex Apalis iMX6Q/D Module on Ixora Carrier Board V1.1
326-
items:
327-
- const: toradex,apalis_imx6q-ixora-v1.1
328-
- const: toradex,apalis_imx6q-ixora
320+
- toradex,apalis_imx6q-ixora # Apalis iMX6Q/D Module on Ixora Carrier Board
321+
- toradex,apalis_imx6q-ixora-v1.1 # Apalis iMX6Q/D Module on Ixora V1.1 Carrier Board
322+
- toradex,apalis_imx6q-eval # Apalis iMX6Q/D Module on Apalis Evaluation Board
329323
- const: toradex,apalis_imx6q
330324
- const: fsl,imx6q
331325

@@ -393,6 +387,8 @@ properties:
393387
- technexion,imx6dl-pico-pi # TechNexion i.MX6DL Pico-Pi
394388
- technologic,imx6dl-ts4900
395389
- technologic,imx6dl-ts7970
390+
- toradex,colibri_imx6dl # Colibri iMX6 Modules
391+
- toradex,colibri_imx6dl-v1_1 # Colibri iMX6 V1.1 Modules
396392
- udoo,imx6dl-udoo # Udoo i.MX6 Dual-lite Board
397393
- vdl,lanmcu # Van der Laan LANMCU board
398394
- wand,imx6dl-wandboard # Wandboard i.MX6 Dual Lite Board
@@ -466,20 +462,18 @@ properties:
466462
- const: phytec,imx6dl-pfla02 # PHYTEC phyFLEX-i.MX6 Quad
467463
- const: fsl,imx6dl
468464

469-
- description: i.MX6DL Toradex Colibri iMX6 Module on Colibri
470-
Evaluation Board V3
465+
- description: i.MX6DL Boards with Toradex Colibri iMX6DL/S Modules
471466
items:
472-
- const: toradex,colibri_imx6dl-eval-v3
473-
- const: toradex,colibri_imx6dl # Colibri iMX6 Module
467+
- enum:
468+
- toradex,colibri_imx6dl-eval-v3 # Colibri iMX6DL/S Module on Colibri Evaluation Board V3
469+
- const: toradex,colibri_imx6dl # Colibri iMX6DL/S Module
474470
- const: fsl,imx6dl
475471

476-
- description: i.MX6DL Toradex Colibri iMX6 Module V1.1 on Colibri
477-
Evaluation Board V3
472+
- description: i.MX6DL Boards with Toradex Colibri iMX6DL/S V1.1 Modules
478473
items:
479-
- const: toradex,colibri_imx6dl-v1_1-eval-v3
480-
- const: toradex,colibri_imx6dl-v1_1 # Colibri iMX6 Module V1.1
481-
- const: toradex,colibri_imx6dl-eval-v3
482-
- const: toradex,colibri_imx6dl # Colibri iMX6 Module
474+
- enum:
475+
- toradex,colibri_imx6dl-v1_1-eval-v3 # Colibri iMX6DL/S V1.1 M. on Colibri Evaluation Board V3
476+
- const: toradex,colibri_imx6dl-v1_1 # Colibri iMX6DL/S V1.1 Module
483477
- const: fsl,imx6dl
484478

485479
- description: i.MX6S DHCOM DRC02 Board
@@ -494,6 +488,7 @@ properties:
494488
- fsl,imx6sl-evk # i.MX6 SoloLite EVK Board
495489
- kobo,tolino-shine2hd
496490
- kobo,tolino-shine3
491+
- kobo,tolino-vision5
497492
- revotics,imx6sl-warp # Revotics WaRP Board
498493
- const: fsl,imx6sl
499494

@@ -502,6 +497,7 @@ properties:
502497
- enum:
503498
- fsl,imx6sll-evk
504499
- kobo,clarahd
500+
- kobo,librah2o
505501
- const: fsl,imx6sll
506502

507503
- description: i.MX6SX based Boards
@@ -586,8 +582,9 @@ properties:
586582
- fsl,imx6ull-14x14-evk # i.MX6 UltraLiteLite 14x14 EVK Board
587583
- kontron,imx6ull-n6411-som # Kontron N6411 SOM
588584
- myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board
589-
- toradex,colibri-imx6ull-eval # Colibri iMX6ULL Module on Colibri Eval Board
590-
- toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT Module on Colibri Eval Board
585+
- toradex,colibri-imx6ull # Colibri iMX6ULL Modules
586+
- toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (eMMC) Module
587+
- toradex,colibri-imx6ull-wifi # Colibri iMX6ULL Wi-Fi / BT Modules
591588
- const: fsl,imx6ull
592589

593590
- description: i.MX6ULL Armadeus Systems OPOS6ULDev Board
@@ -605,6 +602,27 @@ properties:
605602
- const: phytec,imx6ull-pcl063 # PHYTEC phyCORE-i.MX 6ULL
606603
- const: fsl,imx6ull
607604

605+
- description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Modules
606+
items:
607+
- enum:
608+
- toradex,colibri-imx6ull-eval # Colibri iMX6ULL Module on Colibri Evaluation Board
609+
- const: toradex,colibri-imx6ull # Colibri iMX6ULL Module
610+
- const: fsl,imx6dl
611+
612+
- description: i.MX6ULL Boards with Toradex Colibri iMX6ULL 1GB (eMMC) Module
613+
items:
614+
- enum:
615+
- toradex,colibri-imx6ull-emmc-eval # Colibri iMX6ULL 1GB (eMMC) M. on Colibri Evaluation Board
616+
- const: toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (eMMC) Module
617+
- const: fsl,imx6dl
618+
619+
- description: i.MX6ULL Boards with Toradex Colibri iMX6ULL Wi-Fi / BT Modules
620+
items:
621+
- enum:
622+
- toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT M. on Colibri Evaluation Board
623+
- const: toradex,colibri-imx6ull-wifi # Colibri iMX6ULL Wi-Fi / BT Module
624+
- const: fsl,imx6dl
625+
608626
- description: Kontron N6411 S Board
609627
items:
610628
- const: kontron,imx6ull-n6411-s
@@ -622,6 +640,7 @@ properties:
622640
items:
623641
- enum:
624642
- element14,imx7s-warp # Element14 Warp i.MX7 Board
643+
- toradex,colibri-imx7s # Colibri iMX7S Module
625644
- const: fsl,imx7s
626645

627646
- description: i.MX7S Boards with Toradex Colibri iMX7S Module
@@ -653,15 +672,8 @@ properties:
653672
- technexion,imx7d-pico-hobbit # TechNexion i.MX7D Pico-Hobbit
654673
- technexion,imx7d-pico-nymph # TechNexion i.MX7D Pico-Nymph
655674
- technexion,imx7d-pico-pi # TechNexion i.MX7D Pico-Pi
656-
- toradex,colibri-imx7d # Colibri iMX7 Dual Module
657-
- toradex,colibri-imx7d-aster # Colibri iMX7 Dual Module on Aster Carrier Board
658-
- toradex,colibri-imx7d-emmc # Colibri iMX7 Dual 1GB (eMMC) Module
659-
- toradex,colibri-imx7d-emmc-aster # Colibri iMX7 Dual 1GB (eMMC) Module on
660-
# Aster Carrier Board
661-
- toradex,colibri-imx7d-emmc-eval-v3 # Colibri iMX7 Dual 1GB (eMMC) Module on
662-
# Colibri Evaluation Board V3
663-
- toradex,colibri-imx7d-eval-v3 # Colibri iMX7 Dual Module on
664-
# Colibri Evaluation Board V3
675+
- toradex,colibri-imx7d # Colibri iMX7D Module
676+
- toradex,colibri-imx7d-emmc # Colibri iMX7D 1GB (eMMC) Module
665677
- zii,imx7d-rmu2 # ZII RMU2 Board
666678
- zii,imx7d-rpu2 # ZII RPU2 Board
667679
- const: fsl,imx7d
@@ -686,12 +698,12 @@ properties:
686698
- description: i.MX7D Boards with Toradex Colibri i.MX7D Module
687699
items:
688700
- enum:
689-
- toradex,colibri-imx7d-aster # Module on Aster Carrier Board
690-
- toradex,colibri-imx7d-eval-v3 # Module on Colibri Evaluation Board V3
701+
- toradex,colibri-imx7d-aster # Colibri iMX7D Module on Aster Carrier Board
702+
- toradex,colibri-imx7d-eval-v3 # Colibri iMX7D Module on Colibri Evaluation Board V3
691703
- const: toradex,colibri-imx7d
692704
- const: fsl,imx7d
693705

694-
- description: i.MX7D Boards with Toradex Colibri i.MX7D eMMC Module
706+
- description: i.MX7D Boards with Toradex Colibri i.MX7D 1GB (eMMC) Module
695707
items:
696708
- enum:
697709
- toradex,colibri-imx7d-emmc-aster # Module on Aster Carrier Board
@@ -812,10 +824,10 @@ properties:
812824
- enum:
813825
- einfochips,imx8qxp-ai_ml # i.MX8QXP AI_ML Board
814826
- fsl,imx8qxp-mek # i.MX8QXP MEK Board
815-
- toradex,colibri-imx8x # Colibri iMX8X Module
827+
- toradex,colibri-imx8x # Colibri iMX8X Modules
816828
- const: fsl,imx8qxp
817829

818-
- description: Toradex Colibri i.MX8 Evaluation Board
830+
- description: i.MX8QXP Boards with Toradex Coilbri iMX8X Modules
819831
items:
820832
- enum:
821833
- toradex,colibri-imx8x-eval-v3 # Colibri iMX8X Module on Colibri Evaluation Board V3
@@ -847,9 +859,10 @@ properties:
847859
- description: VF610 based Boards
848860
items:
849861
- enum:
862+
- fsl,vf610-twr # VF610 Tower Board
850863
- lwn,bk4 # Liebherr BK4 controller
851864
- phytec,vf610-cosmic # PHYTEC Cosmic/Cosmic+ Board
852-
- fsl,vf610-twr # VF610 Tower Board
865+
- toradex,vf610-colibri_vf61 # Colibri VF61 Modules
853866
- const: fsl,vf610
854867

855868
- description: Toradex Colibri VF61 Module on Colibri Evaluation Board
@@ -886,6 +899,7 @@ properties:
886899
- enum:
887900
- fsl,ls1021a-moxa-uc-8410a
888901
- fsl,ls1021a-qds
902+
- fsl,ls1021a-tsn
889903
- fsl,ls1021a-twr
890904
- const: fsl,ls1021a
891905

@@ -977,6 +991,8 @@ properties:
977991
- description: LX2160A based Boards
978992
items:
979993
- enum:
994+
- fsl,lx2160a-bluebox3
995+
- fsl,lx2160a-bluebox3-rev-a
980996
- fsl,lx2160a-qds
981997
- fsl,lx2160a-rdb
982998
- fsl,lx2162a-qds
@@ -990,6 +1006,13 @@ properties:
9901006
- const: solidrun,lx2160a-cex7
9911007
- const: fsl,lx2160a
9921008

1009+
- description: S32G2 based Boards
1010+
items:
1011+
- enum:
1012+
- nxp,s32g274a-evb
1013+
- nxp,s32g274a-rdb2
1014+
- const: nxp,s32g2
1015+
9931016
- description: S32V234 based Boards
9941017
items:
9951018
- enum:

Documentation/devicetree/bindings/arm/mediatek.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ properties:
3232
- const: mediatek,mt6580
3333
- items:
3434
- enum:
35+
- fairphone,fp1
3536
- mundoreader,bq-aquaris5
3637
- const: mediatek,mt6589
3738
- items:

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ properties:
4343
"#clock-cells":
4444
const: 1
4545

46+
'#reset-cells':
47+
const: 1
48+
4649
required:
4750
- compatible
4851
- reg
@@ -56,4 +59,5 @@ examples:
5659
compatible = "mediatek,mt8173-mmsys", "syscon";
5760
reg = <0x14000000 0x1000>;
5861
#clock-cells = <1>;
62+
#reset-cells = <1>;
5963
};

0 commit comments

Comments
 (0)