Skip to content

Commit e533cda

Browse files
committed
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM Devicetree updates from Olof Johansson: "As usual, most of the changes are to devicetrees. Besides smaller fixes, some refactorings and cleanups, some of the new platforms and chips (or significant features) supported are below: Broadcom boards: - Cisco Meraki MR32 (BCM53016-based) - BCM2711 (RPi4) display pipeline support Actions Semi boards: - Caninos Loucos Labrador SBC (S500-based) - RoseapplePi SBC (S500-based) Allwinner SoCs/boards: - A100 SoC with Perf1 board - Mali, DMA, Cetrus and IR support for R40 SoC Amlogic boards: - Libretch S905x CC V2 board - Hardkernel ODROID-N2+ board Aspeed boards/platforms: - Wistron Mowgli (AST2500-based, Power9 OpenPower server) - Facebook Wedge400 (AST2500-based, ToR switch) Hisilicon SoC: - SD5203 SoC Nvidia boards: - Tegra234 VDK, for pre-silicon Orin SoC NXP i.MX boards: - Librem 5 phone - i.MX8MM DDR4 EVK - Variscite VAR-SOM-MX8MN SoM - Symphony board - Tolino Shine 2 HD - TQMa6 SoM - Y Soft IOTA Orion Rockchip boards: - NanoPi R2S board - A95X-Z2 board - more Rock-Pi4 variants STM32 boards: - Odyssey SOM board (STM32MP157CAC-based) - DH DRC02 board Toshiba SoCs/boards: - Visconti SoC and TPMV7708 board" * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (638 commits) ARM: dts: nspire: Fix SP804 users arm64: dts: lg: Fix SP804 users arm64: dts: lg: Fix SP805 clocks ARM: mstar: Fix up the fallout from moving the dts/dtsi files ARM: mstar: Add mstar prefix to all of the dtsi/dts files ARM: mstar: Add interrupt to pm_uart ARM: mstar: Add interrupt controller to base dtsi ARM: dts: meson8: remove two invalid interrupt lines from the GPU node arm64: dts: ti: k3-j7200-common-proc-board: Add USB support arm64: dts: ti: k3-j7200-common-proc-board: Configure the SERDES lane function arm64: dts: ti: k3-j7200-main: Add USB controller arm64: dts: ti: k3-j7200-main.dtsi: Add USB to SERDES lane MUX arm64: dts: ti: k3-j7200-main: Add SERDES lane control mux dt-bindings: ti-serdes-mux: Add defines for J7200 SoC ARM: dts: hisilicon: add SD5203 dts ARM: dts: hisilicon: fix the system controller compatible nodes arm64: dts: zynqmp: Fix leds subnode name for zcu100/ultra96 v1 arm64: dts: zynqmp: Remove undocumented u-boot properties arm64: dts: zynqmp: Remove additional compatible string for i2c IPs arm64: dts: zynqmp: Rename buses to be align with simple-bus yaml ...
2 parents 2e368dd + 098bfce commit e533cda

660 files changed

Lines changed: 27924 additions & 6530 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/actions.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ properties:
2020
- enum:
2121
- allo,sparky # Allo.com Sparky
2222
- cubietech,cubieboard6 # Cubietech CubieBoard6
23+
- roseapplepi,roseapplepi # RoseapplePi.org RoseapplePi
24+
- const: actions,s500
25+
- items:
26+
- enum:
27+
- caninos,labrador-base-m # Labrador Base Board M v1
28+
- const: caninos,labrador-v2 # Labrador Core v2
2329
- const: actions,s500
2430
- items:
2531
- enum:
@@ -28,6 +34,11 @@ properties:
2834
- const: actions,s500
2935

3036
# The Actions Semi S700 is a quad-core ARM Cortex-A53 SoC.
37+
- items:
38+
- enum:
39+
- caninos,labrador-base-m2 # Labrador Base Board M v2
40+
- const: caninos,labrador-v3 # Labrador Core v3
41+
- const: actions,s700
3142
- items:
3243
- enum:
3344
- cubietech,cubieboard7 # Cubietech CubieBoard7

Documentation/devicetree/bindings/arm/amlogic.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ properties:
9696
- hwacom,amazetv
9797
- khadas,vim
9898
- libretech,aml-s905x-cc
99+
- libretech,aml-s905x-cc-v2
99100
- nexbox,a95x
100101
- const: amlogic,s905x
101102
- const: amlogic,meson-gxl
@@ -153,6 +154,7 @@ properties:
153154
- azw,gtking
154155
- azw,gtking-pro
155156
- hardkernel,odroid-n2
157+
- hardkernel,odroid-n2-plus
156158
- khadas,vim3
157159
- ugoos,am6
158160
- const: amlogic,s922x

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ properties:
4141
- overkiz,kizboxmini-mb # Overkiz kizbox Mini Mother Board
4242
- overkiz,kizboxmini-rd # Overkiz kizbox Mini RailDIN
4343
- overkiz,smartkiz # Overkiz SmartKiz Board
44+
- gardena,smart-gateway-at91sam # GARDENA smart Gateway (Article No. 19000)
4445
- const: atmel,at91sam9g25
4546
- const: atmel,at91sam9x5
4647
- const: atmel,at91sam9

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ properties:
8383
- brcm,bcm953012er
8484
- brcm,bcm953012hr
8585
- brcm,bcm953012k
86+
- meraki,mr32
8687
- const: brcm,brcm53012
88+
- const: brcm,brcm53016
8789
- const: brcm,bcm4708
8890
...

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ properties:
120120
- fsl,imx6q-sabrelite
121121
- fsl,imx6q-sabresd
122122
- kontron,imx6q-samx6i # Kontron i.MX6 Dual/Quad SMARC Module
123+
- logicpd,imx6q-logicpd
123124
- prt,prti6q # Protonic PRTI6Q board
124125
- prt,prtwd2 # Protonic WD2 board
125126
- technexion,imx6q-pico-dwarf # TechNexion i.MX6Q Pico-Dwarf
@@ -156,13 +157,35 @@ properties:
156157
- const: gw,ventana
157158
- const: fsl,imx6q
158159

160+
- description: i.MX6Q PHYTEC phyBOARD-Mira
161+
items:
162+
- enum:
163+
- phytec,imx6q-pbac06-emmc # PHYTEC phyBOARD-Mira eMMC RDK
164+
- phytec,imx6q-pbac06-nand # PHYTEC phyBOARD-Mira NAND RDK
165+
- const: phytec,imx6q-pbac06 # PHYTEC phyBOARD-Mira
166+
- const: phytec,imx6qdl-pcm058 # PHYTEC phyCORE-i.MX6
167+
- const: fsl,imx6q
168+
169+
- description: i.MX6Q PHYTEC phyFLEX-i.MX6
170+
items:
171+
- const: phytec,imx6q-pbab01 # PHYTEC phyFLEX carrier board
172+
- const: phytec,imx6q-pfla02 # PHYTEC phyFLEX-i.MX6 Quad
173+
- const: fsl,imx6q
174+
159175
- description: i.MX6QP based Boards
160176
items:
161177
- enum:
162178
- fsl,imx6qp-sabreauto # i.MX6 Quad Plus SABRE Automotive Board
163179
- fsl,imx6qp-sabresd # i.MX6 Quad Plus SABRE Smart Device Board
164180
- const: fsl,imx6qp
165181

182+
- description: i.MX6QP PHYTEC phyBOARD-Mira
183+
items:
184+
- const: phytec,imx6qp-pbac06-nand
185+
- const: phytec,imx6qp-pbac06 # PHYTEC phyBOARD-Mira
186+
- const: phytec,imx6qdl-pcm058 # PHYTEC phyCORE-i.MX6
187+
- const: fsl,imx6qp
188+
166189
- description: i.MX6DL based Boards
167190
items:
168191
- enum:
@@ -188,6 +211,7 @@ properties:
188211
- toradex,colibri_imx6dl-v1_1-eval-v3 # Colibri iMX6 Module V1.1 on Colibri Evaluation Board V3
189212
- ysoft,imx6dl-yapp4-draco # i.MX6 DualLite Y Soft IOTA Draco board
190213
- ysoft,imx6dl-yapp4-hydra # i.MX6 DualLite Y Soft IOTA Hydra board
214+
- ysoft,imx6dl-yapp4-orion # i.MX6 DualLite Y Soft IOTA Orion board
191215
- ysoft,imx6dl-yapp4-ursa # i.MX6 Solo Y Soft IOTA Ursa board
192216
- const: fsl,imx6dl
193217

@@ -211,10 +235,26 @@ properties:
211235
- const: gw,ventana
212236
- const: fsl,imx6dl
213237

238+
- description: i.MX6DL PHYTEC phyBOARD-Mira
239+
items:
240+
- enum:
241+
- phytec,imx6dl-pbac06-emmc # PHYTEC phyBOARD-Mira eMMC RDK
242+
- phytec,imx6dl-pbac06-nand # PHYTEC phyBOARD-Mira NAND RDK
243+
- const: phytec,imx6dl-pbac06 # PHYTEC phyBOARD-Mira
244+
- const: phytec,imx6qdl-pcm058 # PHYTEC phyCORE-i.MX6
245+
- const: fsl,imx6dl
246+
247+
- description: i.MX6DL PHYTEC phyFLEX-i.MX6
248+
items:
249+
- const: phytec,imx6dl-pbab01 # PHYTEC phyFLEX carrier board
250+
- const: phytec,imx6dl-pfla02 # PHYTEC phyFLEX-i.MX6 Quad
251+
- const: fsl,imx6dl
252+
214253
- description: i.MX6SL based Boards
215254
items:
216255
- enum:
217256
- fsl,imx6sl-evk # i.MX6 SoloLite EVK Board
257+
- kobo,tolino-shine2hd
218258
- kobo,tolino-shine3
219259
- const: fsl,imx6sl
220260

@@ -246,6 +286,15 @@ properties:
246286
- technexion,imx6ul-pico-pi # TechNexion i.MX6UL Pico-Pi
247287
- const: fsl,imx6ul
248288

289+
- description: i.MX6UL PHYTEC phyBOARD-Segin
290+
items:
291+
- enum:
292+
- phytec,imx6ul-pbacd10-emmc
293+
- phytec,imx6ul-pbacd10-nand
294+
- const: phytec,imx6ul-pbacd10 # PHYTEC phyBOARD-Segin with i.MX6 UL
295+
- const: phytec,imx6ul-pcl063 # PHYTEC phyCORE-i.MX 6UL
296+
- const: fsl,imx6ul
297+
249298
- description: Kontron N6310 S Board
250299
items:
251300
- const: kontron,imx6ul-n6310-s
@@ -277,6 +326,15 @@ properties:
277326
- toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT Module on Colibri Eval Board
278327
- const: fsl,imx6ull
279328

329+
- description: i.MX6ULL PHYTEC phyBOARD-Segin
330+
items:
331+
- enum:
332+
- phytec,imx6ull-pbacd10-emmc
333+
- phytec,imx6ull-pbacd10-nand
334+
- const: phytec,imx6ull-pbacd10 # PHYTEC phyBOARD-Segin with i.MX6 ULL
335+
- const: phytec,imx6ull-pcl063 # PHYTEC phyCORE-i.MX 6ULL
336+
- const: fsl,imx6ull
337+
280338
- description: Kontron N6411 S Board
281339
items:
282340
- const: kontron,imx6ull-n6411-s
@@ -344,7 +402,16 @@ properties:
344402
- description: i.MX8MM based Boards
345403
items:
346404
- enum:
405+
- beacon,imx8mm-beacon-kit # i.MX8MM Beacon Development Kit
406+
- fsl,imx8mm-ddr4-evk # i.MX8MM DDR4 EVK Board
347407
- fsl,imx8mm-evk # i.MX8MM EVK Board
408+
- variscite,var-som-mx8mm # i.MX8MM Variscite VAR-SOM-MX8MM module
409+
- const: fsl,imx8mm
410+
411+
- description: Variscite VAR-SOM-MX8MM based boards
412+
items:
413+
- const: variscite,var-som-mx8mm-symphony
414+
- const: variscite,var-som-mx8mm
348415
- const: fsl,imx8mm
349416

350417
- description: i.MX8MN based Boards
@@ -354,6 +421,12 @@ properties:
354421
- fsl,imx8mn-evk # i.MX8MN LPDDR4 EVK Board
355422
- const: fsl,imx8mn
356423

424+
- description: Variscite VAR-SOM-MX8MN based boards
425+
items:
426+
- const: variscite,var-som-mx8mn-symphony
427+
- const: variscite,var-som-mx8mn
428+
- const: fsl,imx8mn
429+
357430
- description: i.MX8MP based Boards
358431
items:
359432
- enum:
@@ -372,13 +445,35 @@ properties:
372445
- technexion,pico-pi-imx8m # TechNexion PICO-PI-8M evk
373446
- const: fsl,imx8mq
374447

448+
- description: Purism Librem5 phones
449+
items:
450+
- enum:
451+
- purism,librem5r2 # Purism Librem5 phone "Chestnut"
452+
- purism,librem5r3 # Purism Librem5 phone "Dogwood"
453+
- const: purism,librem5
454+
- const: fsl,imx8mq
455+
456+
- description: Zodiac Inflight Innovations Ultra Boards
457+
items:
458+
- enum:
459+
- zii,imx8mq-ultra-rmb3
460+
- zii,imx8mq-ultra-zest
461+
- const: zii,imx8mq-ultra
462+
- const: fsl,imx8mq
463+
375464
- description: i.MX8QXP based Boards
376465
items:
377466
- enum:
378467
- einfochips,imx8qxp-ai_ml # i.MX8QXP AI_ML Board
379468
- fsl,imx8qxp-mek # i.MX8QXP MEK Board
380469
- toradex,colibri-imx8x # Colibri iMX8X Module
470+
- const: fsl,imx8qxp
471+
472+
- description: Toradex Colibri i.MX8 Evaluation Board
473+
items:
474+
- enum:
381475
- toradex,colibri-imx8x-eval-v3 # Colibri iMX8X Module on Colibri Evaluation Board V3
476+
- const: toradex,colibri-imx8x
382477
- const: fsl,imx8qxp
383478

384479
- description:

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,16 @@ description: |
4040
sdm630
4141
sdm660
4242
sdm845
43+
sm8250
4344
4445
The 'board' element must be one of the following strings:
4546
4647
cdp
4748
cp01-c1
4849
dragonboard
4950
hk01
51+
hk10-c1
52+
hk10-c2
5053
idp
5154
liquid
5255
mtp
@@ -150,6 +153,8 @@ properties:
150153
- items:
151154
- enum:
152155
- qcom,ipq8074-hk01
156+
- qcom,ipq8074-hk10-c1
157+
- qcom,ipq8074-hk10-c2
153158
- const: qcom,ipq8074
154159

155160
- items:
@@ -167,4 +172,10 @@ properties:
167172
- qcom,ipq6018-cp01-c1
168173
- const: qcom,ipq6018
169174

175+
- items:
176+
- enum:
177+
- qcom,qrb5165-rb5
178+
- qcom,sm8250-mtp
179+
- const: qcom,sm8250
180+
170181
...

Documentation/devicetree/bindings/arm/renesas.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,18 @@ properties:
281281
- renesas,draak # Draak (RTP0RC77995SEB0010S)
282282
- const: renesas,r8a77995
283283

284+
- description: R-Car V3U (R8A779A0)
285+
items:
286+
- enum:
287+
- renesas,falcon-cpu # Falcon CPU board (RTP0RC779A0CPB0010S)
288+
- const: renesas,r8a779a0
289+
290+
- items:
291+
- enum:
292+
- renesas,falcon-breakout # Falcon BreakOut board (RTP0RC779A0BOB0010S)
293+
- const: renesas,falcon-cpu
294+
- const: renesas,r8a779a0
295+
284296
- description: RZ/N1D (R9A06G032)
285297
items:
286298
- enum:

Documentation/devicetree/bindings/arm/rockchip.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ properties:
104104
- firefly,roc-rk3399-pc-mezzanine
105105
- const: rockchip,rk3399
106106

107+
- description: FriendlyElec NanoPi R2S
108+
items:
109+
- const: friendlyarm,nanopi-r2s
110+
- const: rockchip,rk3328
111+
107112
- description: FriendlyElec NanoPi4 series boards
108113
items:
109114
- enum:
@@ -430,8 +435,12 @@ properties:
430435
- const: radxa,rock
431436
- const: rockchip,rk3188
432437

433-
- description: Radxa ROCK Pi 4
438+
- description: Radxa ROCK Pi 4A/B/C
434439
items:
440+
- enum:
441+
- radxa,rockpi4a
442+
- radxa,rockpi4b
443+
- radxa,rockpi4c
435444
- const: radxa,rockpi4
436445
- const: rockchip,rk3399
437446

@@ -555,4 +564,9 @@ properties:
555564
items:
556565
- const: tronsmart,orion-r68-meta
557566
- const: rockchip,rk3368
567+
568+
- description: Zkmagic A95X Z2
569+
items:
570+
- const: zkmagic,a95x-z2
571+
- const: rockchip,rk3318
558572
...

Documentation/devicetree/bindings/arm/samsung/pmu.yaml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ select:
2424
- samsung,exynos5420-pmu
2525
- samsung,exynos5433-pmu
2626
- samsung,exynos7-pmu
27+
- samsung-s5pv210-pmu
2728
required:
2829
- compatible
2930

@@ -40,6 +41,7 @@ properties:
4041
- samsung,exynos5420-pmu
4142
- samsung,exynos5433-pmu
4243
- samsung,exynos7-pmu
44+
- samsung-s5pv210-pmu
4345
- const: syscon
4446

4547
reg:
@@ -88,12 +90,28 @@ properties:
8890
required:
8991
- compatible
9092
- reg
91-
- '#clock-cells'
92-
- clock-names
93-
- clocks
9493

9594
additionalProperties: false
9695

96+
allOf:
97+
- if:
98+
properties:
99+
compatible:
100+
contains:
101+
enum:
102+
- samsung,exynos3250-pmu
103+
- samsung,exynos4210-pmu
104+
- samsung,exynos4412-pmu
105+
- samsung,exynos5250-pmu
106+
- samsung,exynos5410-pmu
107+
- samsung,exynos5420-pmu
108+
- samsung,exynos5433-pmu
109+
then:
110+
required:
111+
- '#clock-cells'
112+
- clock-names
113+
- clocks
114+
97115
examples:
98116
- |
99117
#include <dt-bindings/clock/exynos5250.h>

Documentation/devicetree/bindings/arm/stm32/stm32.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,10 @@ properties:
5252
- const: st,stm32mp157c-ev1
5353
- const: st,stm32mp157c-ed1
5454
- const: st,stm32mp157
55+
- description: Odyssey STM32MP1 SoM based Boards
56+
items:
57+
- enum:
58+
- seeed,stm32mp157c-odyssey
59+
- const: seeed,stm32mp157c-odyssey-som
60+
- const: st,stm32mp157
5561
...

0 commit comments

Comments
 (0)