Skip to content

Commit da8d07a

Browse files
committed
Merge tag 'devicetree-for-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree updates from Rob Herring: "Bindings: - Add spi-peripheral-props.yaml references to various SPI device bindings - Convert qcom,pm8916-wdt, ds1307, Qualcomm BAM DMA, is31fl319x, skyworks,aat1290, Rockchip EMAC, gpio-ir-receiver, ahci-ceva, Arm CCN PMU, rda,8810pl-intc, sil,sii9022, ps2-gpio, and arm-firmware-suite bindings to DT schema format - New bindings for Arm virtual platforms display, Qualcomm IMEM memory region, Samsung S5PV210 ChipID, EM Microelectronic EM3027 RTC, and arm,cortex-a78ae - Add vendor prefixes for asrock, bytedance, hxt, ingrasys, inventec, quanta, and densitron - Add missing MSI and IOMMU properties to host-generic-pci - Remove bindings for removed EFM32 platform - Remove old chosen.txt binding (replaced by schema) - Treewide add missing type information for properties - Treewide fixing of typos and its vs. it's in bindings. Its all good now. - Drop unnecessary quoting in power related schemas - Several LED binding updates which didn't get picked up - Move various bindings to proper directories DT core code: - Convert unittest GPIO related tests to use fwnode - Check ima-kexec-buffer against memory bounds - Print reserved-memory allocation/reservation failures as errors - Cleanup early_init_dt_reserve_memory_arch() - Simplify of_overlay_fdt_apply() tail" * tag 'devicetree-for-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (65 commits) dt-bindings: mtd: microchip,mchp48l640: use spi-peripheral-props.yaml dt-bindings: power: supply: drop quotes when not needed dt-bindings: power: reset: drop quotes when not needed dt-bindings: power: drop quotes when not needed dt-bindings: PCI: host-generic-pci: Allow IOMMU and MSI properties of/fdt: declared return type does not match actual return type devicetree/bindings: correct possessive "its" typos dt-bindings: net: convert emac_rockchip.txt to YAML dt-bindings: eeprom: microchip,93lc46b: move to eeprom directory dt-bindings: eeprom: at25: use spi-peripheral-props.yaml dt-bindings: display: use spi-peripheral-props.yaml dt-bindings: watchdog: qcom,pm8916-wdt: convert to dtschema dt-bindings: power: reset: qcom,pon: use absolute path to other schema dt-bindings: iio/dac: adi,ad5766: Add missing type to 'output-range-microvolts' dt-bindings: power: supply: charger-manager: Add missing type for 'cm-battery-stat' dt-bindings: panel: raydium,rm67191: Add missing type to 'video-mode' of/fdt: Clean up early_init_dt_reserve_memory_arch() dt-bindings: PCI: fsl,imx6q-pcie: Add missing type for 'reset-gpio-active-high' dt-bindings: rtc: Add EM Microelectronic EM3027 bindings dt-bindings: rtc: ds1307: Convert to json-schema ...
2 parents 8d9420c + 7e7a24c commit da8d07a

File tree

154 files changed

+1846
-1373
lines changed

Some content is hidden

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

154 files changed

+1846
-1373
lines changed

Documentation/devicetree/bindings/arm/cpus.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ properties:
138138
- arm,cortex-a76
139139
- arm,cortex-a77
140140
- arm,cortex-a78
141+
- arm,cortex-a78ae
141142
- arm,cortex-a510
142143
- arm,cortex-a710
143144
- arm,cortex-m0

Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ system, notifying them when a low power state is entered or exited.
1010
Multiple revisions of the SAW hardware are supported using these Device Nodes.
1111
SAW2 revisions differ in the register offset and configuration data. Also, the
1212
same revision of the SAW in different SoCs may have different configuration
13-
data due the the differences in hardware capabilities. Hence the SoC name, the
13+
data due the differences in hardware capabilities. Hence the SoC name, the
1414
version of the SAW hardware in that SoC and the distinction between cpu (big
1515
or Little) or cache, may be needed to uniquely identify the SAW register
1616
configuration and initialization data. The compatible string is used to

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ properties:
208208
"^[a-z0-9]+$":
209209
type: object
210210

211-
patternProperties:
211+
properties:
212212
clocks:
213213
minItems: 1
214214
maxItems: 8

Documentation/devicetree/bindings/arm/vexpress-sysreg.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ properties:
2929

3030
ranges: true
3131

32+
gpio-controller:
33+
deprecated: true
34+
35+
"#gpio-cells":
36+
deprecated: true
37+
const: 2
38+
3239
additionalProperties: false
3340

3441
patternProperties:
@@ -67,8 +74,7 @@ patternProperties:
6774

6875
required:
6976
- compatible
70-
- "#address-cells"
71-
- "#size-cells"
77+
- reg
7278

7379
examples:
7480
- |

Documentation/devicetree/bindings/ata/ahci-ceva.txt

Lines changed: 0 additions & 63 deletions
This file was deleted.
Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/ata/ceva,ahci-1v84.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ceva AHCI SATA Controller
8+
9+
maintainers:
10+
- Piyush Mehta <[email protected]>
11+
12+
description: |
13+
The Ceva SATA controller mostly conforms to the AHCI interface with some
14+
special extensions to add functionality, is a high-performance dual-port
15+
SATA host controller with an AHCI compliant command layer which supports
16+
advanced features such as native command queuing and frame information
17+
structure (FIS) based switching for systems employing port multipliers.
18+
19+
properties:
20+
compatible:
21+
const: ceva,ahci-1v84
22+
23+
reg:
24+
maxItems: 1
25+
26+
clocks:
27+
maxItems: 1
28+
29+
dma-coherent: true
30+
31+
interrupts:
32+
maxItems: 1
33+
34+
iommus:
35+
maxItems: 1
36+
37+
power-domains:
38+
maxItems: 1
39+
40+
ceva,p0-cominit-params:
41+
$ref: /schemas/types.yaml#/definitions/uint8-array
42+
description: |
43+
OOB timing value for COMINIT parameter for port 0.
44+
The fields for the above parameter must be as shown below:-
45+
ceva,p0-cominit-params = /bits/ 8 <CIBGMN CIBGMX CIBGN CINMP>;
46+
items:
47+
- description: CINMP - COMINIT Negate Minimum Period.
48+
- description: CIBGN - COMINIT Burst Gap Nominal.
49+
- description: CIBGMX - COMINIT Burst Gap Maximum.
50+
- description: CIBGMN - COMINIT Burst Gap Minimum.
51+
52+
ceva,p0-comwake-params:
53+
$ref: /schemas/types.yaml#/definitions/uint8-array
54+
description: |
55+
OOB timing value for COMWAKE parameter for port 0.
56+
The fields for the above parameter must be as shown below:-
57+
ceva,p0-comwake-params = /bits/ 8 <CWBGMN CWBGMX CWBGN CWNMP>;
58+
items:
59+
- description: CWBGMN - COMWAKE Burst Gap Minimum.
60+
- description: CWBGMX - COMWAKE Burst Gap Maximum.
61+
- description: CWBGN - COMWAKE Burst Gap Nominal.
62+
- description: CWNMP - COMWAKE Negate Minimum Period.
63+
64+
ceva,p0-burst-params:
65+
$ref: /schemas/types.yaml#/definitions/uint8-array
66+
description: |
67+
Burst timing value for COM parameter for port 0.
68+
The fields for the above parameter must be as shown below:-
69+
ceva,p0-burst-params = /bits/ 8 <BMX BNM SFD PTST>;
70+
items:
71+
- description: BMX - COM Burst Maximum.
72+
- description: BNM - COM Burst Nominal.
73+
- description: SFD - Signal Failure Detection value.
74+
- description: PTST - Partial to Slumber timer value.
75+
76+
ceva,p0-retry-params:
77+
$ref: /schemas/types.yaml#/definitions/uint16-array
78+
description: |
79+
Retry interval timing value for port 0.
80+
The fields for the above parameter must be as shown below:-
81+
ceva,p0-retry-params = /bits/ 16 <RIT RCT>;
82+
items:
83+
- description: RIT - Retry Interval Timer.
84+
- description: RCT - Rate Change Timer.
85+
86+
ceva,p1-cominit-params:
87+
$ref: /schemas/types.yaml#/definitions/uint8-array
88+
description: |
89+
OOB timing value for COMINIT parameter for port 1.
90+
The fields for the above parameter must be as shown below:-
91+
ceva,p1-cominit-params = /bits/ 8 <CIBGMN CIBGMX CIBGN CINMP>;
92+
items:
93+
- description: CINMP - COMINIT Negate Minimum Period.
94+
- description: CIBGN - COMINIT Burst Gap Nominal.
95+
- description: CIBGMX - COMINIT Burst Gap Maximum.
96+
- description: CIBGMN - COMINIT Burst Gap Minimum.
97+
98+
ceva,p1-comwake-params:
99+
$ref: /schemas/types.yaml#/definitions/uint8-array
100+
description: |
101+
OOB timing value for COMWAKE parameter for port 1.
102+
The fields for the above parameter must be as shown below:-
103+
ceva,p1-comwake-params = /bits/ 8 <CWBGMN CWBGMX CWBGN CWNMP>;
104+
items:
105+
- description: CWBGMN - COMWAKE Burst Gap Minimum.
106+
- description: CWBGMX - COMWAKE Burst Gap Maximum.
107+
- description: CWBGN - COMWAKE Burst Gap Nominal.
108+
- description: CWNMP - COMWAKE Negate Minimum Period.
109+
110+
ceva,p1-burst-params:
111+
$ref: /schemas/types.yaml#/definitions/uint8-array
112+
description: |
113+
Burst timing value for COM parameter for port 1.
114+
The fields for the above parameter must be as shown below:-
115+
ceva,p1-burst-params = /bits/ 8 <BMX BNM SFD PTST>;
116+
items:
117+
- description: BMX - COM Burst Maximum.
118+
- description: BNM - COM Burst Nominal.
119+
- description: SFD - Signal Failure Detection value.
120+
- description: PTST - Partial to Slumber timer value.
121+
122+
ceva,p1-retry-params:
123+
$ref: /schemas/types.yaml#/definitions/uint16-array
124+
description: |
125+
Retry interval timing value for port 1.
126+
The fields for the above parameter must be as shown below:-
127+
ceva,pN-retry-params = /bits/ 16 <RIT RCT>;
128+
items:
129+
- description: RIT - Retry Interval Timer.
130+
- description: RCT - Rate Change Timer.
131+
132+
ceva,broken-gen2:
133+
$ref: /schemas/types.yaml#/definitions/flag
134+
description: |
135+
limit to gen1 speed instead of gen2.
136+
137+
phys:
138+
maxItems: 1
139+
140+
phy-names:
141+
items:
142+
- const: sata-phy
143+
144+
resets:
145+
maxItems: 1
146+
147+
required:
148+
- compatible
149+
- reg
150+
- clocks
151+
- interrupts
152+
- ceva,p0-cominit-params
153+
- ceva,p0-comwake-params
154+
- ceva,p0-burst-params
155+
- ceva,p0-retry-params
156+
- ceva,p1-cominit-params
157+
- ceva,p1-comwake-params
158+
- ceva,p1-burst-params
159+
- ceva,p1-retry-params
160+
161+
additionalProperties: false
162+
163+
examples:
164+
- |
165+
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>
166+
#include <dt-bindings/interrupt-controller/irq.h>
167+
#include <dt-bindings/power/xlnx-zynqmp-power.h>
168+
#include <dt-bindings/reset/xlnx-zynqmp-resets.h>
169+
#include <dt-bindings/clock/xlnx-zynqmp-clk.h>
170+
#include <dt-bindings/phy/phy.h>
171+
172+
sata: ahci@fd0c0000 {
173+
compatible = "ceva,ahci-1v84";
174+
reg = <0xfd0c0000 0x200>;
175+
interrupt-parent = <&gic>;
176+
interrupts = <0 133 IRQ_TYPE_LEVEL_HIGH>;
177+
clocks = <&zynqmp_clk SATA_REF>;
178+
ceva,p0-cominit-params = /bits/ 8 <0x0F 0x25 0x18 0x29>;
179+
ceva,p0-comwake-params = /bits/ 8 <0x04 0x0B 0x08 0x0F>;
180+
ceva,p0-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;
181+
ceva,p0-retry-params = /bits/ 16 <0x0216 0x7F06>;
182+
ceva,p1-cominit-params = /bits/ 8 <0x0F 0x25 0x18 0x29>;
183+
ceva,p1-comwake-params = /bits/ 8 <0x04 0x0B 0x08 0x0F>;
184+
ceva,p1-burst-params = /bits/ 8 <0x0A 0x08 0x4A 0x06>;
185+
ceva,p1-retry-params = /bits/ 16 <0x0216 0x7F06>;
186+
ceva,broken-gen2;
187+
phys = <&psgtr 1 PHY_TYPE_SATA 1 1>;
188+
resets = <&zynqmp_reset ZYNQMP_RESET_SATA>;
189+
};

Documentation/devicetree/bindings/bus/qcom,ssc-block-bus.yaml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@ properties:
2828
- const: qcom,ssc-block-bus
2929

3030
reg:
31-
description: |
32-
Shall contain the addresses of the SSCAON_CONFIG0 and SSCAON_CONFIG1
33-
registers
34-
minItems: 2
35-
maxItems: 2
31+
items:
32+
- description: SSCAON_CONFIG0 registers
33+
- description: SSCAON_CONFIG1 registers
3634

3735
reg-names:
3836
items:
@@ -48,7 +46,6 @@ properties:
4846
ranges: true
4947

5048
clocks:
51-
minItems: 6
5249
maxItems: 6
5350

5451
clock-names:
@@ -61,21 +58,21 @@ properties:
6158
- const: ssc_ahbs
6259

6360
power-domains:
64-
description: Power domain phandles for the ssc_cx and ssc_mx power domains
65-
minItems: 2
66-
maxItems: 2
61+
items:
62+
- description: CX power domain
63+
- description: MX power domain
6764

6865
power-domain-names:
6966
items:
7067
- const: ssc_cx
7168
- const: ssc_mx
7269

7370
resets:
74-
description: |
75-
Reset phandles for the ssc_reset and ssc_bcr resets (note: ssc_bcr is the
76-
branch control register associated with the ssc_xo and ssc_ahbs clocks)
77-
minItems: 2
78-
maxItems: 2
71+
items:
72+
- description: Main reset
73+
- description:
74+
SSC Branch Control Register reset (associated with the ssc_xo and
75+
ssc_ahbs clocks)
7976

8077
reset-names:
8178
items:

0 commit comments

Comments
 (0)