Skip to content

Commit 1afa9c3

Browse files
committed
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM Device-tree updates from Olof Johansson: "New SoCs: - Atmel/Microchip SAM9X60 (ARM926 SoC) - OMAP 37xx gets split into AM3703/AM3715/DM3725, who are all variants of it with different GPU/media IP configurations. - ST stm32mp15 SoCs (1-2 Cortex-A7, CAN, GPU depending on SKU) - ST Ericsson ab8505 (variant of ab8500) and db8520 (variant of db8500) - Unisoc SC9863A SoC (8x Cortex-A55 mobile chipset w/ GPU, modem) - Qualcomm SC7180 (8-core 64bit SoC, unnamed CPU class) New boards: - Allwinner: + Emlid Neutis SoM (H3 variant) + Libre Computer ALL-H3-IT + PineH64 Model B - Amlogic: + Libretech Amlogic GX PC (s905d and s912-based variants) - Atmel/Microchip: + Kizboxmini, sam9x60 EK, sama5d27 Wireless SOM (wlsom1) - Marvell: + Armada 385-based SolidRun Clearfog GTR - NXP: + Gateworks GW59xx boards based on i.MX6/6Q/6QDL + Tolino Shine 3 eBook reader (i.MX6sl) + Embedded Artists COM (i.MX7ULP) + SolidRun CLearfog CX/ITX and HoneyComb (LX2160A-based systems) + Google Coral Edge TPU (i.MX8MQ) - Rockchip: + Radxa Dalang Carrier (supports rk3288 and rk3399 SOMs) + Radxa Rock Pi N10 (RK3399Pro-based) + VMARC RK3399Pro SOM - ST: + Reference boards for stm32mp15 - ST Ericsson: + Samsung Galaxy S III mini (GT-I8190) + HREF520 reference board for DB8520 - TI OMAP: + Gen1 Amazon Echo (OMAP3630-based) - Qualcomm: + Inforce 6640 Single Board Computer (msm8996-based) + SC7180 IDP (SC7180-based)" * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (623 commits) dt-bindings: fix compilation error of the example in marvell,mmp3-hsic-phy.yaml arm64: dts: ti: k3-am654-base-board: Add CSI2 OV5640 camera arm64: dts: ti: k3-am65-main Add CAL node arm64: dts: ti: k3-j721e-main: Add McASP nodes arm64: dts: ti: k3-am654-main: Add McASP nodes arm64: dts: ti: k3-j721e: DMA support arm64: dts: ti: k3-j721e-main: Move secure proxy and smmu under main_navss arm64: dts: ti: k3-j721e-main: Correct main NAVSS representation arm64: dts: ti: k3-j721e: Correct the address for MAIN NAVSS arm64: dts: ti: k3-am65: DMA support arm64: dts: ti: k3-am65-main: Move secure proxy under cbass_main_navss arm64: dts: ti: k3-am65-main: Correct main NAVSS representation ARM: dts: aspeed: rainier: Add UCD90320 power sequencer ARM: dts: aspeed: rainier: Switch PSUs to unknown version arm64: dts: rockchip: Kill off "simple-panel" compatibles ARM: dts: rockchip: Kill off "simple-panel" compatibles arm64: dts: rockchip: rename dwmmc node names to mmc ARM: dts: rockchip: rename dwmmc node names to mmc arm64: dts: exynos: Rename Samsung and Exynos to lowercase arm64: dts: uniphier: add reset-names to NAND controller node ...
2 parents 469030d + d030a0d commit 1afa9c3

File tree

585 files changed

+32373
-15923
lines changed

Some content is hidden

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

585 files changed

+32373
-15923
lines changed

Documentation/devicetree/bindings/arm/amlogic.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ properties:
5959
- friendlyarm,nanopi-k2
6060
- hardkernel,odroid-c2
6161
- nexbox,a95x
62+
- videostrong,kii-pro
6263
- wetek,hub
6364
- wetek,play2
6465
- const: amlogic,meson-gxbb
@@ -104,6 +105,7 @@ properties:
104105
- enum:
105106
- amlogic,p230
106107
- amlogic,p231
108+
- libretech,aml-s905d-pc
107109
- phicomm,n1
108110
- const: amlogic,s905d
109111
- const: amlogic,meson-gxl
@@ -115,6 +117,7 @@ properties:
115117
- amlogic,q201
116118
- khadas,vim2
117119
- kingnovel,r-box-pro
120+
- libretech,aml-s912-pc
118121
- nexbox,a1
119122
- tronsmart,vega-s96
120123
- const: amlogic,s912

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ properties:
3535
- atmel,at91sam9x60
3636
- const: atmel,at91sam9
3737

38+
- items:
39+
- enum:
40+
- overkiz,kizboxmini-base # Overkiz kizbox Mini Base Board
41+
- overkiz,kizboxmini-mb # Overkiz kizbox Mini Mother Board
42+
- overkiz,kizboxmini-rd # Overkiz kizbox Mini RailDIN
43+
- overkiz,smartkiz # Overkiz SmartKiz Board
44+
- const: atmel,at91sam9g25
45+
- const: atmel,at91sam9x5
46+
- const: atmel,at91sam9
47+
3848
- items:
3949
- enum:
4050
- atmel,at91sam9g15
@@ -52,11 +62,32 @@ properties:
5262
- const: atmel,sama5d2
5363
- const: atmel,sama5
5464

65+
- description: Microchip SAMA5D27 WLSOM1
66+
items:
67+
- const: microchip,sama5d27-wlsom1
68+
- const: atmel,sama5d27
69+
- const: atmel,sama5d2
70+
- const: atmel,sama5
71+
72+
- description: Microchip SAMA5D27 WLSOM1 Evaluation Kit
73+
items:
74+
- const: microchip,sama5d27-wlsom1-ek
75+
- const: microchip,sama5d27-wlsom1
76+
- const: atmel,sama5d27
77+
- const: atmel,sama5d2
78+
- const: atmel,sama5
79+
5580
- items:
5681
- const: atmel,sama5d27
5782
- const: atmel,sama5d2
5883
- const: atmel,sama5
5984

85+
- description: SAM9X60-EK board
86+
items:
87+
- const: microchip,sam9x60ek
88+
- const: microchip,sam9x60
89+
- const: atmel,at91sam9
90+
6091
- description: Nattis v2 board with Natte v2 power board
6192
items:
6293
- const: axentia,nattis-2

Documentation/devicetree/bindings/arm/atmel-sysregs.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ RAMC SDRAM/DDR Controller required properties:
4545
"atmel,at91sam9260-sdramc",
4646
"atmel,at91sam9g45-ddramc",
4747
"atmel,sama5d3-ddramc",
48+
"microchip,sam9x60-ddramc"
4849
- reg: Should contain registers location and length
4950

5051
Examples:

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,27 @@ properties:
128128
- variscite,dt6customboard
129129
- const: fsl,imx6q
130130

131+
- description: i.MX6Q Gateworks Ventana Boards
132+
items:
133+
- enum:
134+
- gw,imx6q-gw51xx
135+
- gw,imx6q-gw52xx
136+
- gw,imx6q-gw53xx
137+
- gw,imx6q-gw5400-a
138+
- gw,imx6q-gw54xx
139+
- gw,imx6q-gw551x
140+
- gw,imx6q-gw552x
141+
- gw,imx6q-gw553x
142+
- gw,imx6q-gw560x
143+
- gw,imx6q-gw5903
144+
- gw,imx6q-gw5904
145+
- gw,imx6q-gw5907
146+
- gw,imx6q-gw5910
147+
- gw,imx6q-gw5912
148+
- gw,imx6q-gw5913
149+
- const: gw,ventana
150+
- const: fsl,imx6q
151+
131152
- description: i.MX6QP based Boards
132153
items:
133154
- enum:
@@ -154,10 +175,31 @@ properties:
154175
- ysoft,imx6dl-yapp4-ursa # i.MX6 Solo Y Soft IOTA Ursa board
155176
- const: fsl,imx6dl
156177

178+
- description: i.MX6DL Gateworks Ventana Boards
179+
items:
180+
- enum:
181+
- gw,imx6dl-gw51xx
182+
- gw,imx6dl-gw52xx
183+
- gw,imx6dl-gw53xx
184+
- gw,imx6dl-gw54xx
185+
- gw,imx6dl-gw551x
186+
- gw,imx6dl-gw552x
187+
- gw,imx6dl-gw553x
188+
- gw,imx6dl-gw560x
189+
- gw,imx6dl-gw5903
190+
- gw,imx6dl-gw5904
191+
- gw,imx6dl-gw5907
192+
- gw,imx6dl-gw5910
193+
- gw,imx6dl-gw5912
194+
- gw,imx6dl-gw5913
195+
- const: gw,ventana
196+
- const: fsl,imx6dl
197+
157198
- description: i.MX6SL based Boards
158199
items:
159200
- enum:
160201
- fsl,imx6sl-evk # i.MX6 SoloLite EVK Board
202+
- kobo,tolino-shine3
161203
- const: fsl,imx6sl
162204

163205
- description: i.MX6SLL based Boards
@@ -172,6 +214,7 @@ properties:
172214
- enum:
173215
- fsl,imx6sx-sabreauto # i.MX6 SoloX Sabre Auto Board
174216
- fsl,imx6sx-sdb # i.MX6 SoloX SDB Board
217+
- fsl,imx6sx-sdb-reva # i.MX6 SoloX SDB Rev-A Board
175218
- const: fsl,imx6sx
176219

177220
- description: i.MX6UL based Boards
@@ -239,6 +282,7 @@ properties:
239282
items:
240283
- enum:
241284
- fsl,imx7d-sdb # i.MX7 SabreSD Board
285+
- fsl,imx7d-sdb-reva # i.MX7 SabreSD Rev-A Board
242286
- novtech,imx7d-meerkat96 # i.MX7 Meerkat96 Board
243287
- toradex,colibri-imx7d # Colibri iMX7 Dual Module
244288
- toradex,colibri-imx7d-emmc # Colibri iMX7 Dual 1GB (eMMC) Module
@@ -263,6 +307,7 @@ properties:
263307
- description: i.MX7ULP based Boards
264308
items:
265309
- enum:
310+
- ea,imx7ulp-com # i.MX7ULP Embedded Artists COM Board
266311
- fsl,imx7ulp-evk # i.MX7ULP Evaluation Kit
267312
- const: fsl,imx7ulp
268313

@@ -283,7 +328,9 @@ properties:
283328
items:
284329
- enum:
285330
- boundary,imx8mq-nitrogen8m # i.MX8MQ NITROGEN Board
331+
- einfochips,imx8mq-thor96 # i.MX8MQ Thor96 Board
286332
- fsl,imx8mq-evk # i.MX8MQ EVK Board
333+
- google,imx8mq-phanbell # Google Coral Edge TPU
287334
- purism,librem5-devkit # Purism Librem5 devkit
288335
- solidrun,hummingboard-pulse # SolidRun Hummingboard Pulse
289336
- technexion,pico-pi-imx8m # TechNexion PICO-PI-8M evk
@@ -385,6 +432,13 @@ properties:
385432
- fsl,ls2088a-rdb
386433
- const: fsl,ls2088a
387434

435+
- description: LX2160A based Boards
436+
items:
437+
- enum:
438+
- fsl,lx2160a-qds
439+
- fsl,lx2160a-rdb
440+
- const: fsl,lx2160a
441+
388442
- description: S32V234 based Boards
389443
items:
390444
- enum:

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,30 @@ description: |
2424
2525
The 'SoC' element must be one of the following strings:
2626
27-
apq8016
28-
apq8074
29-
apq8084
30-
apq8096
31-
msm8916
32-
msm8974
33-
msm8992
34-
msm8994
35-
msm8996
36-
mdm9615
37-
ipq8074
38-
sdm845
27+
apq8016
28+
apq8074
29+
apq8084
30+
apq8096
31+
ipq8074
32+
mdm9615
33+
msm8916
34+
msm8974
35+
msm8992
36+
msm8994
37+
msm8996
38+
sc7180
39+
sdm845
3940
4041
The 'board' element must be one of the following strings:
4142
42-
cdp
43-
liquid
44-
dragonboard
45-
mtp
46-
sbc
47-
hk01
48-
qrd
43+
cdp
44+
dragonboard
45+
hk01
46+
idp
47+
liquid
48+
mtp
49+
qrd
50+
sbc
4951
5052
The 'soc_version' and 'board_version' elements take the form of v<Major>.<Minor>
5153
where the minor number may be omitted when it's zero, i.e. v1.0 is the same
@@ -144,4 +146,8 @@ properties:
144146
- qcom,ipq8074-hk01
145147
- const: qcom,ipq8074
146148

149+
- items:
150+
- enum:
151+
- qcom,sc7180-idp
152+
- const: qcom,sc7180
147153
...

Documentation/devicetree/bindings/arm/rockchip.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,9 @@ properties:
409409

410410
- description: Pine64 RockPro64
411411
items:
412+
- enum:
413+
- pine64,rockpro64-v2.1
414+
- pine64,rockpro64-v2.0
412415
- const: pine64,rockpro64
413416
- const: rockchip,rk3399
414417

@@ -422,6 +425,12 @@ properties:
422425
- const: radxa,rockpi4
423426
- const: rockchip,rk3399
424427

428+
- description: Radxa ROCK Pi N10
429+
items:
430+
- const: radxa,rockpi-n10
431+
- const: vamrs,rk3399pro-vmarc-som
432+
- const: rockchip,rk3399pro
433+
425434
- description: Radxa Rock2 Square
426435
items:
427436
- const: radxa,rock2-square

Documentation/devicetree/bindings/arm/sprd.yaml renamed to Documentation/devicetree/bindings/arm/sprd/sprd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright 2019 Unisoc Inc.
33
%YAML 1.2
44
---
5-
$id: http://devicetree.org/schemas/arm/sprd.yaml#
5+
$id: http://devicetree.org/schemas/arm/sprd/sprd.yaml#
66
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

88
title: Unisoc platforms device tree bindings

Documentation/devicetree/bindings/arm/sunxi.yaml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,16 @@ properties:
342342
- const: libretech,all-h3-cc-h5
343343
- const: allwinner,sun50i-h5
344344

345+
- description: Libre Computer Board ALL-H3-IT H5
346+
items:
347+
- const: libretech,all-h3-it-h5
348+
- const: allwinner,sun50i-h5
349+
350+
- description: Libre Computer Board ALL-H5-CC H5
351+
items:
352+
- const: libretech,all-h5-cc-h5
353+
- const: allwinner,sun50i-h5
354+
345355
- description: Lichee Pi One
346356
items:
347357
- const: licheepi,licheepi-one
@@ -470,6 +480,12 @@ properties:
470480
- const: emlid,neutis-n5
471481
- const: allwinner,sun50i-h5
472482

483+
- description: Emlid Neutis N5H3 Developper Board
484+
items:
485+
- const: emlid,neutis-n5h3-devboard
486+
- const: emlid,neutis-n5h3
487+
- const: allwinner,sun8i-h3
488+
473489
- description: NextThing Co. CHIP
474490
items:
475491
- const: nextthing,chip
@@ -599,11 +615,16 @@ properties:
599615
- const: pine64,pine64-plus
600616
- const: allwinner,sun50i-a64
601617

602-
- description: Pine64 PineH64
618+
- description: Pine64 PineH64 model A
603619
items:
604620
- const: pine64,pine-h64
605621
- const: allwinner,sun50i-h6
606622

623+
- description: Pine64 PineH64 model B
624+
items:
625+
- const: pine64,pine-h64-model-b
626+
- const: allwinner,sun50i-h6
627+
607628
- description: Pine64 LTS
608629
items:
609630
- const: pine64,pine64-lts
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
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/ux500.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ux500 platforms device tree bindings
8+
9+
maintainers:
10+
- Linus Walleij <[email protected]>
11+
12+
properties:
13+
$nodename:
14+
const: '/'
15+
compatible:
16+
oneOf:
17+
18+
- description: ST-Ericsson HREF (pre-v60)
19+
items:
20+
- const: st-ericsson,mop500
21+
- const: st-ericsson,u8500
22+
23+
- description: ST-Ericsson HREF (v60+)
24+
items:
25+
- const: st-ericsson,hrefv60+
26+
- const: st-ericsson,u8500
27+
28+
- description: Calao Systems Snowball
29+
items:
30+
- const: calaosystems,snowball-a9500
31+
- const: st-ericsson,u9500
32+
33+
- description: Samsung Galaxy S III mini (GT-I8190)
34+
items:
35+
- const: samsung,golden
36+
- const: st-ericsson,u8500

0 commit comments

Comments
 (0)