Skip to content

Commit 7c636d4

Browse files
committed
Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC DT updates from Arnd Bergmann: "As usual, the bulk of work in the SoC tree goes into DT files, this time with a roughly even split between 32-bit and 64-bit SoCs rather than the usual mostly 64-bit changes. New SoCs: - Microchip SAMA7 SoC family based on Cortex-A7, a new 32-bit platform based on the older SAMA5 series. - Qualcomm Snapdragon SDM636 and SM8150, variations of the existing phone SoCs. - Renesas R-Car H3e-2G and M3e-2G SoCs, variations of older Renesas SoCs. New boards: - Marvell CN913x reference boards - ASpeed AST2600 BMC implementations for Facebook Cloudripper, Elbert and Fuji server boards. - Snapdragon 665 based Sony Xperia 10II - Snapdragon MSM8916 based Xiaomi Redmi 2 - Snapdragon MSM8226 based Samsung Galaxy S3 Neo - NXP i.MX based 32-bit boards: - DHCOM based PicoITX - DHSOM based DRC0ỉ - SolidRun SolidSense - SKOV i.MX6 boards. - NXP i.MX based 64-bit boards: - Nitrogen8 SoM and MNT Reform2 - LS1088A based Traverse Ten64 - i.MX8M based GW7902. - NVIDIA Jetson TX2 NX Developer Kit - 4KOpen STiH418-b2264 development board - ux500 based Samsung phones: Gavini, Codina and Kyle - TI AM335x based Sancloud BBE Lite - ixp4xx dts files to replace all old board files Other changes: - Treewide fixes for dtc warnings - Rockchips i/o domain support - TI OMAP/AM3 CPSW switch driver support - Improved device support for allwinner, aspeed, qualcomm, NXP, nvidia, Renesas, Samsung, Amlogic, Mediatek, ixp4xx, stm32, sti, OMAP and actions" * tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (412 commits) arm/arm64: dts: Fix remaining dtc 'unit_address_format' warnings ARM: dts: rockchip: Add SFC to RV1108 arm64: dts: marvell: armada-37xx: Extend PCIe MEM space ARM: dts: aspeed: p10bmc: Add power control pins ARM: dts: aspeed: cloudripper: Add comments for "mdio1" ARM: dts: aspeed: minipack: Update flash partition table dt-bindings: arm: fsl: Add Traverse Ten64 (LS1088A) board dt-bindings: vendor-prefixes: add Traverse Technologies arm64: dts: add device tree for Traverse Ten64 (LS1088A) arm64: dts: ls1088a: add missing PMU node arm64: dts: ls1088a: add internal PCS for DPMAC1 node ARM: dts: imx6qp-prtwd3: configure ENET_REF clock to 125MHz ARM: dts: vf610-zii-dev-rev-b: Remove #address-cells and #size-cells property from at93c46d dt node ARM: dts: add SKOV imx6q and imx6dl based boards dt-bindings: arm: fsl: add SKOV imx6q and imx6dl based boards dt-bindings: vendor-prefixes: Add an entry for SKOV A/S arm64: dts: imx8mq-reform2: add sound support arm64: dts: imx8m: drop interrupt-affinity for pmu arm64: dts: imx8qxp: update pmu compatible arm64: dts: imx8mm: update pmu compatible ...
2 parents 32b4707 + 9e62ec0 commit 7c636d4

File tree

405 files changed

+27794
-3910
lines changed

Some content is hidden

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

405 files changed

+27794
-3910
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ properties:
145145
- const: atmel,sama5d4
146146
- const: atmel,sama5
147147

148+
- items:
149+
- const: microchip,sama7g5ek # SAMA7G5 Evaluation Kit
150+
- const: microchip,sama7g5
151+
- const: microchip,sama7
152+
148153
- items:
149154
- enum:
150155
- atmel,sams70j19

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ RAMC SDRAM/DDR Controller required properties:
4545
"atmel,at91sam9260-sdramc",
4646
"atmel,at91sam9g45-ddramc",
4747
"atmel,sama5d3-ddramc",
48-
"microchip,sam9x60-ddramc"
48+
"microchip,sam9x60-ddramc",
49+
"microchip,sama7g5-uddrc"
4950
- reg: Should contain registers location and length
5051

5152
Examples:
@@ -55,6 +56,17 @@ Examples:
5556
reg = <0xffffe800 0x200>;
5657
};
5758

59+
RAMC PHY Controller required properties:
60+
- compatible: Should be "microchip,sama7g5-ddr3phy", "syscon"
61+
- reg: Should contain registers location and length
62+
63+
Example:
64+
65+
ddr3phy: ddr3phy@e3804000 {
66+
compatible = "microchip,sama7g5-ddr3phy", "syscon";
67+
reg = <0xe3804000 0x1000>;
68+
};
69+
5870
SHDWC Shutdown Controller
5971

6072
required properties:

Documentation/devicetree/bindings/arm/fsl.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,13 @@ properties:
221221
- prt,prti6q # Protonic PRTI6Q board
222222
- prt,prtwd2 # Protonic WD2 board
223223
- rex,imx6q-rex-pro # Rex Pro i.MX6 Quad Board
224+
- skov,imx6q-skov-revc-lt2 # SKOV IMX6 CPU QuadCore lt2
225+
- skov,imx6q-skov-revc-lt6 # SKOV IMX6 CPU QuadCore lt6
226+
- skov,imx6q-skov-reve-mi1010ait-1cp1 # SKOV IMX6 CPU QuadCore mi1010ait-1cp1
224227
- solidrun,cubox-i/q # SolidRun Cubox-i Dual/Quad
225228
- solidrun,hummingboard/q
226229
- solidrun,hummingboard2/q
230+
- solidrun,solidsense/q # SolidRun SolidSense Dual/Quad
227231
- tbs,imx6q-tbs2910 # TBS2910 Matrix ARM mini PC
228232
- technexion,imx6q-pico-dwarf # TechNexion i.MX6Q Pico-Dwarf
229233
- technexion,imx6q-pico-hobbit # TechNexion i.MX6Q Pico-Hobbit
@@ -377,9 +381,12 @@ properties:
377381
- prt,prtvt7 # Protonic VT7 board
378382
- rex,imx6dl-rex-basic # Rex Basic i.MX6 Dual Lite Board
379383
- riot,imx6s-riotboard # RIoTboard i.MX6S
384+
- skov,imx6dl-skov-revc-lt2 # SKOV IMX6 CPU SoloCore lt2
385+
- skov,imx6dl-skov-revc-lt6 # SKOV IMX6 CPU SoloCore lt6
380386
- solidrun,cubox-i/dl # SolidRun Cubox-i Solo/DualLite
381387
- solidrun,hummingboard/dl
382388
- solidrun,hummingboard2/dl # SolidRun HummingBoard2 Solo/DualLite
389+
- solidrun,solidsense/dl # SolidRun SolidSense Solo/DualLite
383390
- technexion,imx6dl-pico-dwarf # TechNexion i.MX6DL Pico-Dwarf
384391
- technexion,imx6dl-pico-hobbit # TechNexion i.MX6DL Pico-Hobbit
385392
- technexion,imx6dl-pico-nymph # TechNexion i.MX6DL Pico-Nymph
@@ -418,6 +425,12 @@ properties:
418425
- const: dfi,fs700e-m60
419426
- const: fsl,imx6dl
420427

428+
- description: i.MX6DL DHCOM PicoITX Board
429+
items:
430+
- const: dh,imx6dl-dhcom-picoitx
431+
- const: dh,imx6dl-dhcom-som
432+
- const: fsl,imx6dl
433+
421434
- description: i.MX6DL Gateworks Ventana Boards
422435
items:
423436
- enum:
@@ -469,6 +482,12 @@ properties:
469482
- const: toradex,colibri_imx6dl # Colibri iMX6 Module
470483
- const: fsl,imx6dl
471484

485+
- description: i.MX6S DHCOM DRC02 Board
486+
items:
487+
- const: dh,imx6s-dhcom-drc02
488+
- const: dh,imx6s-dhcom-som
489+
- const: fsl,imx6dl
490+
472491
- description: i.MX6SL based Boards
473492
items:
474493
- enum:
@@ -698,6 +717,7 @@ properties:
698717
- gw,imx8mm-gw72xx-0x # i.MX8MM Gateworks Development Kit
699718
- gw,imx8mm-gw73xx-0x # i.MX8MM Gateworks Development Kit
700719
- gw,imx8mm-gw7901 # i.MX8MM Gateworks Board
720+
- gw,imx8mm-gw7902 # i.MX8MM Gateworks Board
701721
- kontron,imx8mm-n801x-som # i.MX8MM Kontron SL (N801X) SOM
702722
- variscite,var-som-mx8mm # i.MX8MM Variscite VAR-SOM-MX8MM module
703723
- const: fsl,imx8mm
@@ -728,6 +748,7 @@ properties:
728748
- beacon,imx8mn-beacon-kit # i.MX8MN Beacon Development Kit
729749
- fsl,imx8mn-ddr4-evk # i.MX8MN DDR4 EVK Board
730750
- fsl,imx8mn-evk # i.MX8MN LPDDR4 EVK Board
751+
- gw,imx8mn-gw7902 # i.MX8MM Gateworks Board
731752
- const: fsl,imx8mn
732753

733754
- description: Variscite VAR-SOM-MX8MN based boards
@@ -752,10 +773,12 @@ properties:
752773
items:
753774
- enum:
754775
- boundary,imx8mq-nitrogen8m # i.MX8MQ NITROGEN Board
776+
- boundary,imx8mq-nitrogen8m-som # i.MX8MQ NITROGEN SoM
755777
- einfochips,imx8mq-thor96 # i.MX8MQ Thor96 Board
756778
- fsl,imx8mq-evk # i.MX8MQ EVK Board
757779
- google,imx8mq-phanbell # Google Coral Edge TPU
758780
- kontron,pitx-imx8m # Kontron pITX-imx8m Board
781+
- mntre,reform2 # MNT Reform2 Laptop
759782
- purism,librem5-devkit # Purism Librem5 devkit
760783
- solidrun,hummingboard-pulse # SolidRun Hummingboard Pulse
761784
- technexion,pico-pi-imx8m # TechNexion PICO-PI-8M evk
@@ -973,6 +996,12 @@ properties:
973996
- fsl,s32v234-evb # S32V234-EVB2 Customer Evaluation Board
974997
- const: fsl,s32v234
975998

999+
- description: Traverse LS1088A based Boards
1000+
items:
1001+
- enum:
1002+
- traverse,ten64 # Ten64 Networking Appliance / Board
1003+
- const: fsl,ls1088a
1004+
9761005
additionalProperties: true
9771006

9781007
...

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ description: |
3131
ipq6018
3232
ipq8074
3333
mdm9615
34+
msm8226
3435
msm8916
3536
msm8974
3637
msm8992
@@ -114,6 +115,11 @@ properties:
114115
- qcom,apq8084-sbc
115116
- const: qcom,apq8084
116117

118+
- items:
119+
- enum:
120+
- samsung,s3ve3g
121+
- const: qcom,msm8226
122+
117123
- items:
118124
- enum:
119125
- qcom,msm8960-cdp
@@ -129,6 +135,8 @@ properties:
129135
- const: qcom,msm8974
130136

131137
- items:
138+
- enum:
139+
- alcatel,idol347
132140
- const: qcom,msm8916-mtp/1
133141
- const: qcom,msm8916-mtp
134142
- const: qcom,msm8916
@@ -181,6 +189,8 @@ properties:
181189
- items:
182190
- enum:
183191
- qcom,sc7280-idp
192+
- qcom,sc7280-idp2
193+
- google,piglin
184194
- google,senor
185195
- const: qcom,sc7280
186196

Documentation/devicetree/bindings/arm/renesas.yaml

Lines changed: 39 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -238,17 +238,29 @@ properties:
238238
- const: renesas,r8a77961
239239

240240
- description: Kingfisher (SBEV-RCAR-KF-M03)
241-
items:
242-
- const: shimafuji,kingfisher
243-
- enum:
244-
- renesas,h3ulcb
245-
- renesas,m3ulcb
246-
- renesas,m3nulcb
247-
- enum:
248-
- renesas,r8a7795
249-
- renesas,r8a7796
250-
- renesas,r8a77961
251-
- renesas,r8a77965
241+
oneOf:
242+
- items:
243+
- const: shimafuji,kingfisher
244+
- enum:
245+
- renesas,h3ulcb
246+
- renesas,m3ulcb
247+
- renesas,m3nulcb
248+
- enum:
249+
- renesas,r8a7795
250+
- renesas,r8a7796
251+
- renesas,r8a77961
252+
- renesas,r8a77965
253+
- items:
254+
- const: shimafuji,kingfisher
255+
- enum:
256+
- renesas,h3ulcb
257+
- renesas,m3ulcb
258+
- enum:
259+
- renesas,r8a779m1
260+
- renesas,r8a779m3
261+
- enum:
262+
- renesas,r8a7795
263+
- renesas,r8a77961
252264

253265
- description: R-Car M3-N (R8A77965)
254266
items:
@@ -296,6 +308,22 @@ properties:
296308
- const: renesas,falcon-cpu
297309
- const: renesas,r8a779a0
298310

311+
- description: R-Car H3e-2G (R8A779M1)
312+
items:
313+
- enum:
314+
- renesas,h3ulcb # H3ULCB (R-Car Starter Kit Premier)
315+
- renesas,salvator-xs # Salvator-XS (Salvator-X 2nd version)
316+
- const: renesas,r8a779m1
317+
- const: renesas,r8a7795
318+
319+
- description: R-Car M3e-2G (R8A779M3)
320+
items:
321+
- enum:
322+
- renesas,m3ulcb # M3ULCB (R-Car Starter Kit Pro)
323+
- renesas,salvator-xs # Salvator-XS (Salvator-X 2nd version)
324+
- const: renesas,r8a779m3
325+
- const: renesas,r8a77961
326+
299327
- description: RZ/N1D (R9A06G032)
300328
items:
301329
- enum:

Documentation/devicetree/bindings/arm/tegra.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ properties:
111111
- items:
112112
- enum:
113113
- nvidia,p2771-0000
114+
- nvidia,p3509-0000+p3636-0001
114115
- const: nvidia,tegra186
115116
- items:
116117
- enum:
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/gpio/aspeed,sgpio.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Aspeed SGPIO controller
8+
9+
maintainers:
10+
- Andrew Jeffery <[email protected]>
11+
12+
description:
13+
This SGPIO controller is for ASPEED AST2400, AST2500 and AST2600 SoC,
14+
AST2600 have two sgpio master one with 128 pins another one with 80 pins,
15+
AST2500/AST2400 have one sgpio master with 80 pins. Each of the Serial
16+
GPIO pins can be programmed to support the following options
17+
- Support interrupt option for each input port and various interrupt
18+
sensitivity option (level-high, level-low, edge-high, edge-low)
19+
- Support reset tolerance option for each output port
20+
- Directly connected to APB bus and its shift clock is from APB bus clock
21+
divided by a programmable value.
22+
- Co-work with external signal-chained TTL components (74LV165/74LV595)
23+
24+
properties:
25+
compatible:
26+
enum:
27+
- aspeed,ast2400-sgpio
28+
- aspeed,ast2500-sgpio
29+
- aspeed,ast2600-sgpiom
30+
31+
reg:
32+
maxItems: 1
33+
34+
gpio-controller: true
35+
36+
'#gpio-cells':
37+
const: 2
38+
39+
interrupts:
40+
maxItems: 1
41+
42+
interrupt-controller: true
43+
44+
clocks:
45+
maxItems: 1
46+
47+
ngpios: true
48+
49+
bus-frequency: true
50+
51+
required:
52+
- compatible
53+
- reg
54+
- gpio-controller
55+
- '#gpio-cells'
56+
- interrupts
57+
- interrupt-controller
58+
- ngpios
59+
- clocks
60+
- bus-frequency
61+
62+
additionalProperties: false
63+
64+
examples:
65+
- |
66+
#include <dt-bindings/clock/aspeed-clock.h>
67+
sgpio: sgpio@1e780200 {
68+
#gpio-cells = <2>;
69+
compatible = "aspeed,ast2500-sgpio";
70+
gpio-controller;
71+
interrupts = <40>;
72+
reg = <0x1e780200 0x0100>;
73+
clocks = <&syscon ASPEED_CLK_APB>;
74+
interrupt-controller;
75+
ngpios = <80>;
76+
bus-frequency = <12000000>;
77+
};

Documentation/devicetree/bindings/gpio/sgpio-aspeed.txt

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)