Skip to content

Commit 6c1561f

Browse files
committed
Merge tag 'soc-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC devicetree updates from Arnd Bergmann: "The biggest change this time is for the 32-bit devicetree files, which are all moved to a new location, using separate subdirectories for each SoC vendor, following the same scheme that is used on arm64, mips and riscv. This has been discussed for many years, but so far we never did this as there was a plan to move the files out of the kernel entirely, which has never happened. The impact of this will be that all external patches no longer apply, and anything depending on the location of the dtb files in the build directory will have to change. The installed files after 'make dtbs_install' keep the current location. There are six added SoCs here that are largely variants of previously added chips. Two other chips are added in a separate branch along with their device drivers. - The Samsung Exynos 4212 makes its return after the Samsung Galaxy Express phone is addded at last. The SoC support was originally added in 2012 but removed again in 2017 as it was unused at the time. - Amlogic C3 is a Cortex-A35 based smart IP camera chip - Qualcomm MSM8939 (Snapdragon 615) is a more featureful variant of the still common MSM8916 (Snapdragon 410) phone chip that has been supported for a long time. - Qualcomm SC8180x (Snapdragon 8cx) is one of their earlier high-end laptop chips, used in the Lenovo Flex 5G, which is added along with the reference board. - Qualcomm SDX75 is the latest generation modem chip that is used as a peripherial in phones but can also run a standalone Linux. Unlike the prior 32-bit SDX65 and SDX55, this now has a 64-bit Cortex-A55. - Alibaba T-Head TH1520 is a quad-core RISC-V chip based on the Xuantie C910 core, a step up from all previously added rv64 chips. All of the above come with reference board implementations, those included there are 39 new board files, but only five more 32-bit this time, probably a new low: - Marantec Maveo board based on dhcor imx6ull module - Endian 4i Edge 200, based on the armv5 Marvell Kirkwood chip - Epson Moverio BT-200 AR glasses based on TI OMAP4 - PHYTEC STM32MP1-3 Dev board based on STM32MP15 PHYTEC SOM - ICnova ADB4006 board based on Allwinner A20 On the 64-bit side, there are also fewer addded machines than we had in the recent releases: - Three boards based on NXP i.MX8: Emtop SoM & Baseboard, NXP i.MX8MM EVKB board and i.MX8MP based Gateworks Venice gw7905-2x device. - NVIDIA IGX Orin and Jetson Orin Nano boards, both based on tegra234 - Qualcomm gains support for 6 reference boards on various members of their IPQ networking SoC series, as well as the Sony Xperia M4 Aqua phone, the Acer Aspire 1 laptop, and the Fxtec Pro1X board on top of the various reference platforms for their new chips. - Rockchips support for several newer boards: Indiedroid Nova (rk3588), Edgeble Neural Compute Module 6B (rk3588), FriendlyARM NanoPi R2C Plus (rk3328), Anbernic RG353PS (rk3566), Lunzn Fastrhino R66S/R68S (rk3568) - TI K3/AM625 based PHYTEC phyBOARD-Lyra-AM625 board and Toradex Verdin family with AM62 COM, carrier and dev boards Other changes to existing boards contain the usual minor improvements along with - continued updates to clean up dts files based on dtc warnings and binding checks, in particular cache properties and node names - support for devicetree overlays on at91, bcm283x - significant additions to existing SoC support on mediatek, qualcomm, ti k3 family, starfive jh71xx, NXP i.MX6 and i.MX8, ST STM32MP1 As usual, a lot more detail is available in the individual merge commits" * tag 'soc-dt-6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (926 commits) ARM: mvebu: fix unit address on armada-390-db flash ARM: dts: Move .dts files to vendor sub-directories kbuild: Support flat DTBs install ARM: dts: Add .dts files missing from the build ARM: dts: allwinner: Use quoted #include ARM: dts: lan966x: kontron-d10: add PHY interrupts ARM: dts: lan966x: kontron-d10: fix SPI CS ARM: dts: lan966x: kontron-d10: fix board reset ARM: dts: at91: Enable device-tree overlay support for AT91 boards arm: dts: Enable device-tree overlay support for AT91 boards arm64: dts: exynos: Remove clock from Exynos850 pmu_system_controller ARM: dts: at91: use generic name for shutdown controller ARM: dts: BCM5301X: Add cells sizes to PCIe nodes dt-bindings: firmware: brcm,kona-smc: convert to YAML riscv: dts: sort makefile entries by directory riscv: defconfig: enable T-HEAD SoC MAINTAINERS: add entry for T-HEAD RISC-V SoC riscv: dts: thead: add sipeed Lichee Pi 4A board device tree riscv: dts: add initial T-HEAD TH1520 SoC device tree riscv: Add the T-HEAD SoC family Kconfig option ...
2 parents b775d6c + 46448b3 commit 6c1561f

3,186 files changed

Lines changed: 49206 additions & 9705 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/amlogic.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/arm/amlogic.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Amlogic MesonX
7+
title: Amlogic SoC based Platforms
88

99
maintainers:
1010
- Kevin Hilman <khilman@baylibre.com>
@@ -205,6 +205,13 @@ properties:
205205
- amlogic,ad401
206206
- const: amlogic,a1
207207

208+
- description: Boards with the Amlogic C3 C302X/C308L SoC
209+
items:
210+
- enum:
211+
- amlogic,aw409
212+
- amlogic,aw419
213+
- const: amlogic,c3
214+
208215
- description: Boards with the Amlogic Meson S4 S805X2 SoC
209216
items:
210217
- enum:

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ properties:
2525
- enum:
2626
- asus,rt-ac56u
2727
- asus,rt-ac68u
28+
- buffalo,wzr-1166dhp
29+
- buffalo,wzr-1166dhp2
2830
- buffalo,wzr-1750dhp
2931
- linksys,ea6300-v1
3032
- linksys,ea6500-v2
31-
- luxul,xap-1510v1
33+
- luxul,xap-1510-v1
3234
- luxul,xwc-1000
33-
- netgear,r6250v1
34-
- netgear,r6300v2
35+
- netgear,r6250-v1
36+
- netgear,r6300-v2
3537
- smartrg,sr400ac
3638
- brcm,bcm94708
3739
- const: brcm,bcm4708
@@ -42,8 +44,8 @@ properties:
4244
- asus,rt-n18u
4345
- buffalo,wzr-600dhp2
4446
- buffalo,wzr-900dhp
45-
- luxul,xap-1410v1
46-
- luxul,xwr-1200v1
47+
- luxul,xap-1410-v1
48+
- luxul,xwr-1200-v1
4749
- tplink,archer-c5-v2
4850
- const: brcm,bcm47081
4951
- const: brcm,bcm4708
@@ -72,7 +74,7 @@ properties:
7274
- luxul,xap-1610-v1
7375
- luxul,xbr-4500-v1
7476
- luxul,xwc-2000-v1
75-
- luxul,xwr-3100v1
77+
- luxul,xwr-3100-v1
7678
- luxul,xwr-3150-v1
7779
- netgear,r8500
7880
- phicomm,k3

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -726,6 +726,12 @@ properties:
726726
- const: dh,imx6ull-dhcor-som
727727
- const: fsl,imx6ull
728728

729+
- description: i.MX6ULL DHCOR SoM based Boards
730+
items:
731+
- const: marantec,imx6ull-dhcor-maveo-box
732+
- const: dh,imx6ull-dhcor-som
733+
- const: fsl,imx6ull
734+
729735
- description: i.MX6ULL PHYTEC phyBOARD-Segin
730736
items:
731737
- enum:
@@ -901,6 +907,7 @@ properties:
901907
- emtrion,emcon-mx8mm-avari # emCON-MX8MM SoM on Avari Base
902908
- fsl,imx8mm-ddr4-evk # i.MX8MM DDR4 EVK Board
903909
- fsl,imx8mm-evk # i.MX8MM EVK Board
910+
- fsl,imx8mm-evkb # i.MX8MM EVKB Board
904911
- gateworks,imx8mm-gw7904
905912
- gw,imx8mm-gw71xx-0x # i.MX8MM Gateworks Development Kit
906913
- gw,imx8mm-gw72xx-0x # i.MX8MM Gateworks Development Kit
@@ -918,6 +925,12 @@ properties:
918925
- prt,prt8mm # i.MX8MM Protonic PRT8MM Board
919926
- const: fsl,imx8mm
920927

928+
- description: Emtop i.MX8MM based Boards
929+
items:
930+
- const: ees,imx8mm-emtop-baseboard # i.MX8MM Emtop SoM on i.MX8M Mini Baseboard V1
931+
- const: ees,imx8mm-emtop-som # i.MX8MM Emtop SOM-IMX8MMLPD4 module
932+
- const: fsl,imx8mm
933+
921934
- description: Engicam i.Core MX8M Mini SoM based boards
922935
items:
923936
- enum:
@@ -1019,6 +1032,7 @@ properties:
10191032
- dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC
10201033
- fsl,imx8mp-evk # i.MX8MP EVK Board
10211034
- gateworks,imx8mp-gw74xx # i.MX8MP Gateworks Board
1035+
- gateworks,imx8mp-gw7905-2x # i.MX8MP Gateworks Board
10221036
- polyhex,imx8mp-debix # Polyhex Debix boards
10231037
- polyhex,imx8mp-debix-model-a # Polyhex Debix Model A Board
10241038
- toradex,verdin-imx8mp # Verdin iMX8M Plus Modules

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ description: |
4040
msm8939
4141
msm8953
4242
msm8956
43+
msm8960
4344
msm8974
4445
msm8976
4546
msm8992
@@ -69,6 +70,7 @@ description: |
6970
sdm845
7071
sdx55
7172
sdx65
73+
sdx75
7274
sm4250
7375
sm6115
7476
sm6115p
@@ -85,9 +87,15 @@ description: |
8587
The 'board' element must be one of the following strings:
8688
8789
adp
90+
ap-al02-c2
91+
ap-al02-c6
8892
ap-al02-c7
93+
ap-al02-c8
94+
ap-al02-c9
8995
ap-mi01.2
96+
ap-mi01.3
9097
ap-mi01.6
98+
ap-mi01.9
9199
cdp
92100
cp01-c1
93101
dragonboard
@@ -191,6 +199,7 @@ properties:
191199
- items:
192200
- enum:
193201
- qcom,msm8960-cdp
202+
- samsung,expressatt
194203
- const: qcom,msm8960
195204

196205
- items:
@@ -333,7 +342,9 @@ properties:
333342
- items:
334343
- enum:
335344
- qcom,ipq5332-ap-mi01.2
345+
- qcom,ipq5332-ap-mi01.3
336346
- qcom,ipq5332-ap-mi01.6
347+
- qcom,ipq5332-ap-mi01.9
337348
- const: qcom,ipq5332
338349

339350
- items:
@@ -351,7 +362,11 @@ properties:
351362

352363
- items:
353364
- enum:
365+
- qcom,ipq9574-ap-al02-c2
366+
- qcom,ipq9574-ap-al02-c6
354367
- qcom,ipq9574-ap-al02-c7
368+
- qcom,ipq9574-ap-al02-c8
369+
- qcom,ipq9574-ap-al02-c9
355370
- const: qcom,ipq9574
356371

357372
- description: Sierra Wireless MangOH Green with WP8548 Module
@@ -380,9 +395,9 @@ properties:
380395
- qcom,qru1000-idp
381396
- const: qcom,qru1000
382397

383-
- description: Qualcomm Technologies, Inc. SC7180 IDP
384-
items:
398+
- items:
385399
- enum:
400+
- acer,aspire1
386401
- qcom,sc7180-idp
387402
- const: qcom,sc7180
388403

@@ -819,6 +834,11 @@ properties:
819834
- qcom,sdx65-mtp
820835
- const: qcom,sdx65
821836

837+
- items:
838+
- enum:
839+
- qcom,sdx75-idp
840+
- const: qcom,sdx75
841+
822842
- items:
823843
- enum:
824844
- qcom,ipq6018-cp01
@@ -882,6 +902,11 @@ properties:
882902
- const: qcom,qrb4210
883903
- const: qcom,sm4250
884904

905+
- items:
906+
- enum:
907+
- fxtec,pro1x
908+
- const: qcom,sm6115
909+
885910
- items:
886911
- enum:
887912
- lenovo,j606f
@@ -1042,6 +1067,7 @@ allOf:
10421067
- qcom,sdm845
10431068
- qcom,sdx55
10441069
- qcom,sdx65
1070+
- qcom,sdx75
10451071
- qcom,sm4250
10461072
- qcom,sm6115
10471073
- qcom,sm6125

Documentation/devicetree/bindings/arm/rockchip.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ properties:
4040
- const: anbernic,rg353p
4141
- const: rockchip,rk3566
4242

43+
- description: Anbernic RG353PS
44+
items:
45+
- const: anbernic,rg353ps
46+
- const: rockchip,rk3566
47+
4348
- description: Anbernic RG353V
4449
items:
4550
- const: anbernic,rg353v
@@ -102,6 +107,12 @@ properties:
102107
- const: edgeble,neural-compute-module-6a # Edgeble Neural Compute Module 6A SoM
103108
- const: rockchip,rk3588
104109

110+
- description: Edgeble Neural Compute Module 6(Neu6) Model B SoM based boards
111+
items:
112+
- const: edgeble,neural-compute-module-6b-io # Edgeble Neural Compute Module 6B IO Board
113+
- const: edgeble,neural-compute-module-6b # Edgeble Neural Compute Module 6B SoM
114+
- const: rockchip,rk3588
115+
105116
- description: Elgin RV1108 R1
106117
items:
107118
- const: elgin,rv1108-r1
@@ -189,6 +200,7 @@ properties:
189200
items:
190201
- enum:
191202
- friendlyarm,nanopi-r2c
203+
- friendlyarm,nanopi-r2c-plus
192204
- friendlyarm,nanopi-r2s
193205
- const: rockchip,rk3328
194206

@@ -534,6 +546,11 @@ properties:
534546
- const: hugsun,x99
535547
- const: rockchip,rk3399
536548

549+
- description: Indiedroid Nova SBC
550+
items:
551+
- const: indiedroid,nova
552+
- const: rockchip,rk3588s
553+
537554
- description: Khadas Edge series boards
538555
items:
539556
- enum:
@@ -562,6 +579,13 @@ properties:
562579
- const: leez,p710
563580
- const: rockchip,rk3399
564581

582+
- description: Lunzn FastRhino R66S / R68S
583+
items:
584+
- enum:
585+
- lunzn,fastrhino-r66s
586+
- lunzn,fastrhino-r68s
587+
- const: rockchip,rk3568
588+
565589
- description: mqmaker MiQi
566590
items:
567591
- const: mqmaker,miqi

Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,16 @@ properties:
7272
- const: samsung,exynos4210
7373
- const: samsung,exynos4
7474

75+
- description: Samsung Galaxy Tab3 family boards
76+
items:
77+
- enum:
78+
- samsung,t310 # Samsung Galaxy Tab 3 8.0 WiFi (SM-T310)
79+
- samsung,t311 # Samsung Galaxy Tab 3 8.0 3G (SM-T311)
80+
- samsung,t315 # Samsung Galaxy Tab 3 8.0 LTE (SM-T315)
81+
- const: samsung,tab3
82+
- const: samsung,exynos4212
83+
- const: samsung,exynos4
84+
7585
- description: Exynos4412 based boards
7686
items:
7787
- enum:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,12 @@ properties:
155155
- const: seeed,stm32mp157c-odyssey-som
156156
- const: st,stm32mp157
157157

158+
- description: Phytec STM32MP1 SoM based Boards
159+
items:
160+
- const: phytec,phycore-stm32mp1-3
161+
- const: phytec,phycore-stm32mp157c-som
162+
- const: st,stm32mp157
163+
158164
additionalProperties: true
159165

160166
...

Documentation/devicetree/bindings/arm/sunxi.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,12 @@ properties:
305305
- const: allwinner,i12-tvbox
306306
- const: allwinner,sun7i-a20
307307

308+
- description: ICnova A20 ADB4006
309+
items:
310+
- const: incircuit,icnova-a20-adb4006
311+
- const: incircuit,icnova-a20
312+
- const: allwinner,sun7i-a20
313+
308314
- description: ICNova A20 SWAC
309315
items:
310316
- const: incircuit,icnova-a20-swac

Documentation/devicetree/bindings/arm/tegra.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@ properties:
167167
- const: nvidia,p3737-0000+p3701-0000
168168
- const: nvidia,p3701-0000
169169
- const: nvidia,tegra234
170+
- description: NVIDIA IGX Orin Development Kit
171+
items:
172+
- const: nvidia,p3740-0002+p3701-0008
173+
- const: nvidia,p3701-0008
174+
- const: nvidia,tegra234
170175
- description: Jetson Orin NX
171176
items:
172177
- const: nvidia,p3767-0000
@@ -176,5 +181,14 @@ properties:
176181
- const: nvidia,p3768-0000+p3767-0000
177182
- const: nvidia,p3767-0000
178183
- const: nvidia,tegra234
184+
- description: Jetson Orin Nano
185+
items:
186+
- const: nvidia,p3767-0005
187+
- const: nvidia,tegra234
188+
- description: Jetson Orin Nano Developer Kit
189+
items:
190+
- const: nvidia,p3768-0000+p3767-0005
191+
- const: nvidia,p3767-0005
192+
- const: nvidia,tegra234
179193

180194
additionalProperties: true

Documentation/devicetree/bindings/arm/ti/k3.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ properties:
2525
- ti,am62a7-sk
2626
- const: ti,am62a7
2727

28+
- description: K3 AM625 SoC PHYTEC phyBOARD-Lyra
29+
items:
30+
- const: phytec,am625-phyboard-lyra-rdk
31+
- const: phytec,am62-phycore-som
32+
- const: ti,am625
33+
2834
- description: K3 AM625 SoC
2935
items:
3036
- enum:
@@ -33,6 +39,26 @@ properties:
3339
- ti,am62-lp-sk
3440
- const: ti,am625
3541

42+
- description: K3 AM62x SoC Toradex Verdin Modules and Carrier Boards
43+
items:
44+
- enum:
45+
- toradex,verdin-am62-nonwifi-dahlia # Verdin AM62 Module on Dahlia
46+
- toradex,verdin-am62-nonwifi-dev # Verdin AM62 Module on Verdin Development Board
47+
- toradex,verdin-am62-nonwifi-yavia # Verdin AM62 Module on Yavia
48+
- const: toradex,verdin-am62-nonwifi # Verdin AM62 Module without Wi-Fi / BT
49+
- const: toradex,verdin-am62 # Verdin AM62 Module
50+
- const: ti,am625
51+
52+
- description: K3 AM62x SoC Toradex Verdin Modules and Carrier Boards with Wi-Fi / BT
53+
items:
54+
- enum:
55+
- toradex,verdin-am62-wifi-dahlia # Verdin AM62 Wi-Fi / BT Module on Dahlia
56+
- toradex,verdin-am62-wifi-dev # Verdin AM62 Wi-Fi / BT M. on Verdin Development B.
57+
- toradex,verdin-am62-wifi-yavia # Verdin AM62 Wi-Fi / BT Module on Yavia
58+
- const: toradex,verdin-am62-wifi # Verdin AM62 Wi-Fi / BT Module
59+
- const: toradex,verdin-am62 # Verdin AM62 Module
60+
- const: ti,am625
61+
3662
- description: K3 AM642 SoC
3763
items:
3864
- enum:

0 commit comments

Comments
 (0)