Skip to content

Commit 6c60000

Browse files
committed
Merge tag 'soc-dt-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC devicetree updates from Arnd Bergmann: "The updates this time are a bit smaller than most times, mainly because it is not totally dominated by new Qualcomm hardware support. Instead, we larger than average updates for Rockchips, NXP, Allwinner and TI. The only two new SoCs this time are both from NXP and are minor variants of already supported ones. The updates for aspeed, amlogic and mediatek came a little late, so I'm saving those for part 2 in a few days if everything turns out fine. New machines this time contain: - two Broadcom SoC based wireless routers from Asus - Five allwinner based consumer devices for gaming, set-top-box and eboot reader applications - Three older phones based on Qualcomm chips, plus the more recent Sony Xperia 1 V - 14 industrial and embedded boards based on NXP i.MX6, i.MX8, layerscape and s32g3 SoCs - six rockchips boards including another handheld game console and a few single-board computers On top of these, we have the usual cleanups for dtc warnings and updates to add more features to already merged machines" * tag 'soc-dt-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (612 commits) arm64: dts: marvell: espressobin-ultra: fix Ethernet Switch unit address arm64: dts: marvell: turris-mox: drop unneeded flash address/size-cells arm64: dts: marvell: eDPU: drop redundant address/size-cells arm64: dts: qcom: pm6150: correct USB VBUS regulator compatible arm64: dts: rockchip: add rk3588 pcie and php IOMMUs arm64: dts: rockchip: enable onboard spi flash for rock-3a arm64: dts: rockchip: add USB-C support to rk3588s-orangepi-5 arm64: dts: rockchip: Enable GPU on Orange Pi 5 arm64: dts: rockchip: enable GPU on khadas-edge2 arm64: dts: rockchip: Add USB3 on Edgeble NCM6A-IO board arm64: dts: rockchip: Support poweroff on Edgeble Neural Compute Module arm64: dts: rockchip: Add Radxa ROCK 3C dt-bindings: arm: rockchip: add Radxa ROCK 3C arm64: dts: exynos: gs101: specify empty clocks for remaining pinctrl arm64: dts: exynos: gs101: specify bus clock for pinctrl_hsi2 arm64: dts: exynos: gs101: specify bus clock for pinctrl_peric[01] arm64: dts: exynos: gs101: specify bus clock for pinctrl (far) alive arm64: dts: Add/fix /memory node unit-addresses arm64: dts: qcom: qcs404: fix bluetooth device address arm64: dts: qcom: sc8280xp-x13s: enable USB MP and fingerprint reader ...
2 parents d65e1a0 + 0cb7e0c commit 6c60000

File tree

565 files changed

+23909
-5102
lines changed

Some content is hidden

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

565 files changed

+23909
-5102
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ properties:
5353
- description: BCM4709 based boards
5454
items:
5555
- enum:
56+
- asus,rt-ac3200
5657
- asus,rt-ac87u
5758
- buffalo,wxr-1900dhp
5859
- linksys,ea9200
@@ -67,6 +68,7 @@ properties:
6768
items:
6869
- enum:
6970
- asus,rt-ac3100
71+
- asus,rt-ac5300
7072
- asus,rt-ac88u
7173
- dlink,dir-885l
7274
- dlink,dir-890l

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,30 @@ properties:
4646
- compatible
4747
- "#clock-cells"
4848

49+
gpio:
50+
type: object
51+
additionalProperties: false
52+
53+
properties:
54+
compatible:
55+
const: raspberrypi,firmware-gpio
56+
57+
gpio-controller: true
58+
59+
"#gpio-cells":
60+
const: 2
61+
description:
62+
The first cell is the pin number, and the second cell is used to
63+
specify the gpio polarity (GPIO_ACTIVE_HIGH or GPIO_ACTIVE_LOW).
64+
65+
gpio-line-names:
66+
minItems: 8
67+
68+
required:
69+
- compatible
70+
- gpio-controller
71+
- "#gpio-cells"
72+
4973
reset:
5074
type: object
5175
additionalProperties: false
@@ -96,6 +120,12 @@ examples:
96120
#clock-cells = <1>;
97121
};
98122
123+
expgpio: gpio {
124+
compatible = "raspberrypi,firmware-gpio";
125+
gpio-controller;
126+
#gpio-cells = <2>;
127+
};
128+
99129
reset: reset {
100130
compatible = "raspberrypi,firmware-reset";
101131
#reset-cells = <1>;

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -813,6 +813,14 @@ properties:
813813
- const: tq,imx6ull-tqma6ull2l # MCIMX6Y2, LGA SoM variant
814814
- const: fsl,imx6ull
815815

816+
- description: Seeed Stuido i.MX6ULL SoM on dev boards
817+
items:
818+
- enum:
819+
- seeed,imx6ull-seeed-npi-emmc
820+
- seeed,imx6ull-seeed-npi-nand
821+
- const: seeed,imx6ull-seeed-npi
822+
- const: fsl,imx6ull
823+
816824
- description: i.MX6ULZ based Boards
817825
items:
818826
- enum:
@@ -1050,6 +1058,7 @@ properties:
10501058
- enum:
10511059
- beacon,imx8mp-beacon-kit # i.MX8MP Beacon Development Kit
10521060
- dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC
1061+
- emcraft,imx8mp-navqp # i.MX8MP Emcraft Systems NavQ+ Kit
10531062
- fsl,imx8mp-evk # i.MX8MP EVK Board
10541063
- gateworks,imx8mp-gw71xx-2x # i.MX8MP Gateworks Board
10551064
- gateworks,imx8mp-gw72xx-2x # i.MX8MP Gateworks Board
@@ -1218,7 +1227,6 @@ properties:
12181227
- enum:
12191228
- einfochips,imx8qxp-ai_ml # i.MX8QXP AI_ML Board
12201229
- fsl,imx8qxp-mek # i.MX8QXP MEK Board
1221-
- toradex,colibri-imx8x # Colibri iMX8X Modules
12221230
- const: fsl,imx8qxp
12231231

12241232
- description: i.MX8DXL based Boards
@@ -1227,15 +1235,17 @@ properties:
12271235
- fsl,imx8dxl-evk # i.MX8DXL EVK Board
12281236
- const: fsl,imx8dxl
12291237

1230-
- description: i.MX8QXP Boards with Toradex Colibri iMX8X Modules
1238+
- description: i.MX8QXP/i.MX8DX Boards with Toradex Colibri iMX8X Modules
12311239
items:
12321240
- enum:
12331241
- toradex,colibri-imx8x-aster # Colibri iMX8X Module on Aster Board
12341242
- toradex,colibri-imx8x-eval-v3 # Colibri iMX8X Module on Colibri Evaluation Board V3
12351243
- toradex,colibri-imx8x-iris # Colibri iMX8X Module on Iris Board
12361244
- toradex,colibri-imx8x-iris-v2 # Colibri iMX8X Module on Iris Board V2
12371245
- const: toradex,colibri-imx8x
1238-
- const: fsl,imx8qxp
1246+
- enum:
1247+
- fsl,imx8qxp
1248+
- fsl,imx8dx
12391249

12401250
- description:
12411251
TQMa8Xx is a series of SOM featuring NXP i.MX8X system-on-chip
@@ -1536,6 +1546,12 @@ properties:
15361546
- nxp,s32g274a-rdb2
15371547
- const: nxp,s32g2
15381548

1549+
- description: S32G3 based Boards
1550+
items:
1551+
- enum:
1552+
- nxp,s32g399a-rdb3
1553+
- const: nxp,s32g3
1554+
15391555
- description: S32V234 based Boards
15401556
items:
15411557
- enum:

Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ properties:
6161
mboxes:
6262
minItems: 2
6363

64-
ti,system-reboot-controller:
65-
description: Determines If system reboot can be triggered by SoC reboot
66-
type: boolean
67-
6864
ti,host-id:
6965
$ref: /schemas/types.yaml#/definitions/uint32
7066
description: |
@@ -94,7 +90,6 @@ examples:
9490
- |
9591
pmmc: system-controller@2921800 {
9692
compatible = "ti,k2g-sci";
97-
ti,system-reboot-controller;
9893
mbox-names = "rx", "tx";
9994
mboxes = <&msgmgr 5 2>,
10095
<&msgmgr 0 0>;

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ properties:
137137
- microsoft,dempsey
138138
- microsoft,makepeace
139139
- microsoft,moneypenny
140+
- motorola,falcon
140141
- samsung,s3ve3g
141142
- const: qcom,msm8226
142143

@@ -184,13 +185,16 @@ properties:
184185
- oneplus,bacon
185186
- samsung,klte
186187
- sony,xperia-castor
188+
- sony,xperia-leo
187189
- const: qcom,msm8974pro
188190
- const: qcom,msm8974
189191

190192
- items:
191-
- const: qcom,msm8916-mtp
192-
- const: qcom,msm8916-mtp/1
193-
- const: qcom,msm8916
193+
- enum:
194+
- samsung,kltechn
195+
- const: samsung,klte
196+
- const: qcom,msm8974pro
197+
- const: qcom,msm8974
194198

195199
- items:
196200
- enum:
@@ -200,6 +204,8 @@ properties:
200204
- gplus,fl8005a
201205
- huawei,g7
202206
- longcheer,l8910
207+
- longcheer,l8150
208+
- qcom,msm8916-mtp
203209
- samsung,a3u-eur
204210
- samsung,a5u-eur
205211
- samsung,e5
@@ -220,11 +226,6 @@ properties:
220226
- yiming,uz801-v3
221227
- const: qcom,msm8916
222228

223-
- items:
224-
- const: longcheer,l8150
225-
- const: qcom,msm8916-v1-qrd/9-v1
226-
- const: qcom,msm8916
227-
228229
- items:
229230
- enum:
230231
- motorola,potter
@@ -1003,6 +1004,7 @@ properties:
10031004
- qcom,sm8550-hdk
10041005
- qcom,sm8550-mtp
10051006
- qcom,sm8550-qrd
1007+
- sony,pdx234
10061008
- const: qcom,sm8550
10071009

10081010
- items:

Documentation/devicetree/bindings/arm/rockchip.yaml

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ properties:
4949
- anbernic,rg-arc-s
5050
- const: rockchip,rk3566
5151

52+
- description: ArmSoM Sige7 board
53+
items:
54+
- const: armsom,sige7
55+
- const: rockchip,rk3588
56+
5257
- description: Asus Tinker board
5358
items:
5459
- const: asus,rk3288-tinker
@@ -198,6 +203,13 @@ properties:
198203
- const: firefly,rk3568-roc-pc
199204
- const: rockchip,rk3568
200205

206+
- description: Forlinx FET3588-C SoM
207+
items:
208+
- enum:
209+
- forlinx,ok3588-c
210+
- const: forlinx,fet3588-c
211+
- const: rockchip,rk3588
212+
201213
- description: FriendlyElec NanoPi R2 series boards
202214
items:
203215
- enum:
@@ -236,6 +248,11 @@ properties:
236248
- const: friendlyarm,nanopc-t6
237249
- const: rockchip,rk3588
238250

251+
- description: GameForce Chi
252+
items:
253+
- const: gameforce,chi
254+
- const: rockchip,rk3326
255+
239256
- description: GeekBuying GeekBox
240257
items:
241258
- const: geekbuying,geekbox
@@ -631,7 +648,7 @@ properties:
631648
- const: phytec,rk3288-phycore-som
632649
- const: rockchip,rk3288
633650

634-
- description: Pine64 PinebookPro
651+
- description: Pine64 Pinebook Pro
635652
items:
636653
- const: pine64,pinebook-pro
637654
- const: rockchip,rk3399
@@ -644,7 +661,7 @@ properties:
644661
- const: pine64,pinenote
645662
- const: rockchip,rk3566
646663

647-
- description: Pine64 PinePhonePro
664+
- description: Pine64 PinePhone Pro
648665
items:
649666
- const: pine64,pinephone-pro
650667
- const: rockchip,rk3399
@@ -682,7 +699,7 @@ properties:
682699
- const: pine64,quartzpro64
683700
- const: rockchip,rk3588
684701

685-
- description: Pine64 SoQuartz SoM
702+
- description: Pine64 SOQuartz
686703
items:
687704
- enum:
688705
- pine64,soquartz-blade
@@ -700,12 +717,17 @@ properties:
700717
- powkiddy,x55
701718
- const: rockchip,rk3566
702719

720+
- description: Protonic MECSBC board
721+
items:
722+
- const: prt,mecsbc
723+
- const: rockchip,rk3568
724+
703725
- description: QNAP TS-433-4G 4-Bay NAS
704726
items:
705727
- const: qnap,ts433
706728
- const: rockchip,rk3568
707729

708-
- description: Radxa Compute Module 3(CM3)
730+
- description: Radxa Compute Module 3 (CM3)
709731
items:
710732
- enum:
711733
- radxa,cm3-io
@@ -767,22 +789,27 @@ properties:
767789
- const: radxa,rockpis
768790
- const: rockchip,rk3308
769791

770-
- description: Radxa Rock2 Square
792+
- description: Radxa Rock 2 Square
771793
items:
772794
- const: radxa,rock2-square
773795
- const: rockchip,rk3288
774796

775-
- description: Radxa ROCK3 Model A
797+
- description: Radxa ROCK 3A
776798
items:
777799
- const: radxa,rock3a
778800
- const: rockchip,rk3568
779801

780-
- description: Radxa ROCK 5 Model A
802+
- description: Radxa ROCK 3C
803+
items:
804+
- const: radxa,rock-3c
805+
- const: rockchip,rk3566
806+
807+
- description: Radxa ROCK 5A
781808
items:
782809
- const: radxa,rock-5a
783810
- const: rockchip,rk3588s
784811

785-
- description: Radxa ROCK 5 Model B
812+
- description: Radxa ROCK 5B
786813
items:
787814
- const: radxa,rock-5b
788815
- const: rockchip,rk3588
@@ -927,6 +954,11 @@ properties:
927954
- const: turing,rk1
928955
- const: rockchip,rk3588
929956

957+
- description: WolfVision PF5 mainboard
958+
items:
959+
- const: wolfvision,rk3568-pf5
960+
- const: rockchip,rk3568
961+
930962
- description: Xunlong Orange Pi 5 Plus
931963
items:
932964
- const: xunlong,orangepi-5-plus

Documentation/devicetree/bindings/arm/sunxi.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,21 @@ properties:
5656
- const: anbernic,rg-nano
5757
- const: allwinner,sun8i-v3s
5858

59+
- description: Anbernic RG35XX (2024)
60+
- items:
61+
- const: anbernic,rg35xx-2024
62+
- const: allwinner,sun50i-h700
63+
64+
- description: Anbernic RG35XX Plus
65+
- items:
66+
- const: anbernic,rg35xx-plus
67+
- const: allwinner,sun50i-h700
68+
69+
- description: Anbernic RG35XX H
70+
- items:
71+
- const: anbernic,rg35xx-h
72+
- const: allwinner,sun50i-h700
73+
5974
- description: Amarula A64 Relic
6075
items:
6176
- const: amarula,a64-relic
@@ -774,6 +789,11 @@ properties:
774789
- const: pocketbook,touch-lux-3
775790
- const: allwinner,sun5i-a13
776791

792+
- description: PocketBook 614 Plus
793+
items:
794+
- const: pocketbook,614-plus
795+
- const: allwinner,sun5i-a13
796+
777797
- description: Point of View Protab2-IPS9
778798
items:
779799
- const: pov,protab2-ips9
@@ -860,6 +880,11 @@ properties:
860880
- const: allwinner,sl631
861881
- const: allwinner,sun8i-v3
862882

883+
- description: Tanix TX1
884+
items:
885+
- const: oranth,tanix-tx1
886+
- const: allwinner,sun50i-h616
887+
863888
- description: Tanix TX6
864889
items:
865890
- const: oranth,tanix-tx6

0 commit comments

Comments
 (0)