Skip to content

Commit e083bbd

Browse files
committed
Merge tag 'arm-dt-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM devicetree updates from Olof Johansson: "Like always, the DT branch is sizable. There are numerous additions and fixes to existing platforms, but also a handful of new ones introduced. Less than some other releases, but there's been significant work on cleanups, refactorings and device enabling on existing platforms. A non-exhaustive list of new material: - Refactoring of BCM2711 dtsi structure to add support for the Raspberry Pi 400 - Rockchip: RK3568 SoC and EVB, video codecs for rk3036/3066/3188/322x - Qualcomm: SA8155p Automotive platform (SM8150 derivative), SM8150/8250 enhancements and support for Sony Xperia 1/1II and 5/5II - TI K3: PCI/USB3 support on AM64-sk boards, R5 remoteproc definitions - TI OMAP: Various cleanups - Tegra: Audio support for Jetson Xavier NX, SMMU support on Tegra194 - Qualcomm: lots of additions for peripherals across several SoCs, and new support for Microsoft Surface Duo (SM8150-based), Huawei Ascend G7. - i.MX: Numerous additions of features across SoCs and boards. - Allwinner: More device bindings for V3s, Forlinx OKA40i-C and NanoPi R1S H5 boards - MediaTek: More device bindings for mt8167, new Chromebook system variants for mt8183 - Renesas: RZ/G2L SoC and EVK added - Amlogic: BananaPi BPI-M5 board added" * tag 'arm-dt-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (511 commits) arm64: dts: rockchip: add basic dts for RK3568 EVB arm64: dts: rockchip: add core dtsi for RK3568 SoC arm64: dts: rockchip: add generic pinconfig settings used by most Rockchip socs ARM: dts: rockchip: add vpu and vdec node for RK322x ARM: dts: rockchip: add vpu nodes for RK3066 and RK3188 ARM: dts: rockchip: add vpu node for RK3036 arm64: dts: ipq8074: Add QUP6 I2C node arm64: dts: rockchip: Re-add regulator-always-on for vcc_sdio for rk3399-roc-pc arm64: dts: rockchip: Re-add regulator-boot-on, regulator-always-on for vdd_gpu on rk3399-roc-pc arm64: dts: rockchip: add ir-receiver for rk3399-roc-pc arm64: dts: rockchip: Add USB-C port details for rk3399 Firefly arm64: dts: rockchip: Sort rk3399 firefly pinmux entries arm64: dts: rockchip: add infrared receiver node to RK3399 Firefly arm64: dts: rockchip: add SPDIF node for rk3399-firefly arm64: dts: rockchip: Add Rotation Property for OGA Panel arm64: dts: qcom: sc7180: bus votes for eMMC and SD card arm64: dts: qcom: sm8250-edo: Add Samsung touchscreen arm64: dts: qcom: sm8250-edo: Enable GPI DMA arm64: dts: qcom: sm8250-edo: Enable ADSP/CDSP/SLPI arm64: dts: qcom: sm8250-edo: Enable PCIe ...
2 parents 6e207b8 + b62b189 commit e083bbd

552 files changed

Lines changed: 24060 additions & 3691 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ properties:
167167
- description: Boards with the Amlogic Meson SM1 S905X3/D3/Y3 SoC
168168
items:
169169
- enum:
170+
- bananapi,bpi-m5
170171
- hardkernel,odroid-c4
171172
- hardkernel,odroid-hc4
172173
- khadas,vim3l

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- description: BCM2711 based Boards
1919
items:
2020
- enum:
21+
- raspberrypi,400
2122
- raspberrypi,4-model-b
2223
- const: brcm,bcm2711
2324

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ properties:
197197
- boundary,imx6q-nitrogen6x
198198
- compulab,cm-fx6 # CompuLab CM-FX6
199199
- dmo,imx6q-edmqmx6 # Data Modul eDM-QMX6 Board
200+
- ds,imx6q-sbc # Da Sheng COM-9XX Modules
200201
- embest,imx6q-marsboard # Embest MarS Board i.MX6Dual
201202
- emtrion,emcon-mx6 # emCON-MX6D or emCON-MX6Q SoM
202203
- emtrion,emcon-mx6-avari # emCON-MX6D or emCON-MX6Q SoM on Avari Base
@@ -400,6 +401,17 @@ properties:
400401
- const: armadeus,imx6dl-apf6 # APF6 (Solo) SoM
401402
- const: fsl,imx6dl
402403

404+
- description: i.MX6DL based congatec QMX6 Boards
405+
items:
406+
- enum:
407+
- ge,imx6dl-b105v2 # General Electric B105v2
408+
- ge,imx6dl-b105pv2 # General Electric B105Pv2
409+
- ge,imx6dl-b125v2 # General Electric B125v2
410+
- ge,imx6dl-b125pv2 # General Electric B125Pv2
411+
- ge,imx6dl-b155v2 # General Electric B155v2
412+
- const: congatec,qmx6
413+
- const: fsl,imx6dl
414+
403415
- description: i.MX6DL based DFI FS700-M60-6DL Board
404416
items:
405417
- const: dfi,fs700-m60-6dl
@@ -685,6 +697,7 @@ properties:
685697
- gw,imx8mm-gw71xx-0x # i.MX8MM Gateworks Development Kit
686698
- gw,imx8mm-gw72xx-0x # i.MX8MM Gateworks Development Kit
687699
- gw,imx8mm-gw73xx-0x # i.MX8MM Gateworks Development Kit
700+
- gw,imx8mm-gw7901 # i.MX8MM Gateworks Board
688701
- kontron,imx8mm-n801x-som # i.MX8MM Kontron SL (N801X) SOM
689702
- variscite,var-som-mx8mm # i.MX8MM Variscite VAR-SOM-MX8MM module
690703
- const: fsl,imx8mm

Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ properties:
1717
- items:
1818
- enum:
1919
- linksys,nslu2
20+
- welltech,epbx100
2021
- const: intel,ixp42x
2122
- items:
2223
- enum:

Documentation/devicetree/bindings/arm/mediatek.yaml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ properties:
122122
- enum:
123123
- mediatek,mt8195-evb
124124
- const: mediatek,mt8195
125+
- description: Google Burnet (HP Chromebook x360 11MK G3 EE)
126+
items:
127+
- const: google,burnet
128+
- const: mediatek,mt8183
125129
- description: Google Krane (Lenovo IdeaPad Duet, 10e,...)
126130
items:
127131
- enum:
@@ -133,9 +137,19 @@ properties:
133137
items:
134138
- const: google,damu
135139
- const: mediatek,mt8183
136-
- description: Google Juniper (Acer Chromebook Spin 311)
140+
- description: Google Fennel (Lenovo IdeaPad 3 Chromebook)
141+
items:
142+
- enum:
143+
- google,fennel-sku0
144+
- google,fennel-sku1
145+
- google,fennel-sku6
146+
- const: google,fennel
147+
- const: mediatek,mt8183
148+
- description: Google Juniper (Acer Chromebook Spin 311) / Kenzo (Acer Chromebook 311)
137149
items:
138-
- const: google,juniper-sku16
150+
- enum:
151+
- google,juniper-sku16
152+
- google,juniper-sku17
139153
- const: google,juniper
140154
- const: mediatek,mt8183
141155
- description: Google Kakadu (ASUS Chromebook Detachable CM3)
@@ -144,6 +158,10 @@ properties:
144158
- const: google,kakadu-rev2
145159
- const: google,kakadu
146160
- const: mediatek,mt8183
161+
- description: Google Kappa (HP Chromebook 11a)
162+
items:
163+
- const: google,kappa
164+
- const: mediatek,mt8183
147165
- description: Google Kodama (Lenovo 10e Chromebook Tablet)
148166
items:
149167
- enum:
@@ -153,6 +171,13 @@ properties:
153171
- google,kodama-sku32
154172
- const: google,kodama
155173
- const: mediatek,mt8183
174+
- description: Google Willow (Acer Chromebook 311 C722/C722T)
175+
items:
176+
- enum:
177+
- google,willow-sku0
178+
- google,willow-sku1
179+
- const: google,willow
180+
- const: mediatek,mt8183
156181
- items:
157182
- enum:
158183
- mediatek,mt8183-pumpkin

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,20 @@ description: |
3636
msm8992
3737
msm8994
3838
msm8996
39+
sa8155p
3940
sc7180
4041
sc7280
4142
sdm630
4243
sdm660
4344
sdm845
4445
sdx55
46+
sm8150
4547
sm8250
4648
sm8350
4749
4850
The 'board' element must be one of the following strings:
4951
52+
adp
5053
cdp
5154
cp01-c1
5255
dragonboard
@@ -178,6 +181,7 @@ properties:
178181
- items:
179182
- enum:
180183
- qcom,sc7280-idp
184+
- google,senor
181185
- const: qcom,sc7280
182186

183187
- items:
@@ -198,6 +202,16 @@ properties:
198202
- qcom,ipq6018-cp01-c1
199203
- const: qcom,ipq6018
200204

205+
- items:
206+
- enum:
207+
- qcom,sa8155p-adp
208+
- const: qcom,sa8155p
209+
210+
- items:
211+
- enum:
212+
- qcom,sm8150-mtp
213+
- const: qcom,sm8150
214+
201215
- items:
202216
- enum:
203217
- qcom,qrb5165-rb5

Documentation/devicetree/bindings/arm/renesas.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,24 @@ properties:
302302
- renesas,rzn1d400-db # RZN1D-DB (RZ/N1D Demo Board for the RZ/N1D 400 pins package)
303303
- const: renesas,r9a06g032
304304

305+
- description: RZ/G2UL (R9A07G043)
306+
items:
307+
- enum:
308+
- renesas,r9a07g043u11 # RZ/G2UL Type-1
309+
- renesas,r9a07g043u12 # RZ/G2UL Type-2
310+
- const: renesas,r9a07g043
311+
312+
- description: RZ/G2{L,LC} (R9A07G044)
313+
items:
314+
- enum:
315+
- renesas,smarc-evk # SMARC EVK
316+
- enum:
317+
- renesas,r9a07g044c1 # Single Cortex-A55 RZ/G2LC
318+
- renesas,r9a07g044c2 # Dual Cortex-A55 RZ/G2LC
319+
- renesas,r9a07g044l1 # Single Cortex-A55 RZ/G2L
320+
- renesas,r9a07g044l2 # Dual Cortex-A55 RZ/G2L
321+
- const: renesas,r9a07g044
322+
305323
additionalProperties: true
306324

307325
...

Documentation/devicetree/bindings/arm/rockchip.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,11 @@ properties:
600600
- const: zkmagic,a95x-z2
601601
- const: rockchip,rk3318
602602

603+
- description: Rockchip RK3568 Evaluation board
604+
items:
605+
- const: rockchip,rk3568-evb1-v10
606+
- const: rockchip,rk3568
607+
603608
additionalProperties: true
604609

605610
...

Documentation/devicetree/bindings/arm/sunxi.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,12 @@ properties:
224224
- const: empire-electronix,m712
225225
- const: allwinner,sun5i-a13
226226

227+
- description: Forlinx OKA40i-C Development board
228+
items:
229+
- const: forlinx,oka40i-c
230+
- const: forlinx,feta40i-c
231+
- const: allwinner,sun8i-r40
232+
227233
- description: FriendlyARM NanoPi A64
228234
items:
229235
- const: friendlyarm,nanopi-a64
@@ -269,6 +275,11 @@ properties:
269275
- const: friendlyarm,nanopi-r1
270276
- const: allwinner,sun8i-h3
271277

278+
- description: FriendlyARM NanoPi R1S H5
279+
items:
280+
- const: friendlyarm,nanopi-r1s-h5
281+
- const: allwinner,sun50i-h5
282+
272283
- description: FriendlyARM ZeroPi
273284
items:
274285
- const: friendlyarm,zeropi

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,33 @@ patternProperties:
301301

302302
additionalProperties: false
303303

304+
core-domain:
305+
type: object
306+
description: |
307+
The vast majority of hardware blocks of Tegra SoC belong to a
308+
Core power domain, which has a dedicated voltage rail that powers
309+
the blocks.
310+
311+
properties:
312+
operating-points-v2:
313+
description:
314+
Should contain level, voltages and opp-supported-hw property.
315+
The supported-hw is a bitfield indicating SoC speedo or process
316+
ID mask.
317+
318+
"#power-domain-cells":
319+
const: 0
320+
321+
required:
322+
- operating-points-v2
323+
- "#power-domain-cells"
324+
325+
additionalProperties: false
326+
327+
core-supply:
328+
description:
329+
Phandle to voltage regulator connected to the SoC Core power rail.
330+
304331
required:
305332
- compatible
306333
- reg
@@ -325,6 +352,7 @@ examples:
325352
tegra_pmc: pmc@7000e400 {
326353
compatible = "nvidia,tegra210-pmc";
327354
reg = <0x7000e400 0x400>;
355+
core-supply = <&regulator>;
328356
clocks = <&tegra_car TEGRA210_CLK_PCLK>, <&clk32k_in>;
329357
clock-names = "pclk", "clk32k_in";
330358
#clock-cells = <1>;
@@ -338,17 +366,24 @@ examples:
338366
nvidia,core-power-req-active-high;
339367
nvidia,sys-clock-req-active-high;
340368
369+
pd_core: core-domain {
370+
operating-points-v2 = <&core_opp_table>;
371+
#power-domain-cells = <0>;
372+
};
373+
341374
powergates {
342375
pd_audio: aud {
343376
clocks = <&tegra_car TEGRA210_CLK_APE>,
344377
<&tegra_car TEGRA210_CLK_APB2APE>;
345378
resets = <&tegra_car 198>;
379+
power-domains = <&pd_core>;
346380
#power-domain-cells = <0>;
347381
};
348382
349383
pd_xusbss: xusba {
350384
clocks = <&tegra_car TEGRA210_CLK_XUSB_SS>;
351385
resets = <&tegra_car TEGRA210_CLK_XUSB_SS>;
386+
power-domains = <&pd_core>;
352387
#power-domain-cells = <0>;
353388
};
354389
};

0 commit comments

Comments
 (0)