Skip to content

Commit 5522e9f

Browse files
committed
Merge v5.13-rc3 into drm-next
drm/i915 is extremely on fire without the below revert from -rc3: commit 293837b Author: Linus Torvalds <[email protected]> Date: Wed May 19 05:55:57 2021 -1000 Revert "i915: fix remap_io_sg to verify the pgprot" Backmerge so we don't have a too wide bisect window for anything that's a more involved workload than booting the driver. Signed-off-by: Daniel Vetter <[email protected]>
2 parents 9a91e5e + c468154 commit 5522e9f

File tree

272 files changed

+2095
-1341
lines changed

Some content is hidden

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

272 files changed

+2095
-1341
lines changed

Documentation/devicetree/bindings/clock/idt,versaclock5.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ properties:
6060
maxItems: 2
6161

6262
idt,xtal-load-femtofarads:
63-
$ref: /schemas/types.yaml#/definitions/uint32
6463
minimum: 9000
6564
maximum: 22760
6665
description: Optional load capacitor for XTAL1 and XTAL2
@@ -84,7 +83,6 @@ patternProperties:
8483
enum: [ 1800000, 2500000, 3300000 ]
8584
idt,slew-percent:
8685
description: The Slew rate control for CMOS single-ended.
87-
$ref: /schemas/types.yaml#/definitions/uint32
8886
enum: [ 80, 85, 90, 100 ]
8987

9088
required:

Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ patternProperties:
102102

103103
st,adc-channel-names:
104104
description: List of single-ended channel names.
105-
$ref: /schemas/types.yaml#/definitions/string-array
106105

107106
st,filter-order:
108107
description: |

Documentation/devicetree/bindings/input/input.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,5 @@ properties:
3838
Duration in seconds which the key should be kept pressed for device to
3939
reset automatically. Device with key pressed reset feature can specify
4040
this property.
41-
$ref: /schemas/types.yaml#/definitions/uint32
4241

4342
additionalProperties: true

Documentation/devicetree/bindings/interconnect/qcom,rpmh.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ properties:
9292
this interconnect to send RPMh commands.
9393
9494
qcom,bcm-voter-names:
95-
$ref: /schemas/types.yaml#/definitions/string-array
9695
description: |
9796
Names for each of the qcom,bcm-voters specified.
9897

Documentation/devicetree/bindings/leds/leds-bcm6328.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ This controller is present on BCM6318, BCM6328, BCM6362 and BCM63268.
44
In these SoCs it's possible to control LEDs both as GPIOs or by hardware.
55
However, on some devices there are Serial LEDs (LEDs connected to a 74x164
66
controller), which can either be controlled by software (exporting the 74x164
7-
as spi-gpio. See Documentation/devicetree/bindings/gpio/gpio-74x164.txt), or
8-
by hardware using this driver.
7+
as spi-gpio. See Documentation/devicetree/bindings/gpio/fairchild,74hc595.yaml),
8+
or by hardware using this driver.
99
Some of these Serial LEDs are hardware controlled (e.g. ethernet LEDs) and
1010
exporting the 74x164 as spi-gpio prevents those LEDs to be hardware
1111
controlled, so the only chance to keep them working is by using this driver.

Documentation/devicetree/bindings/leds/leds-bcm6358.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ LEDs connected to Broadcom BCM6358 controller
33
This controller is present on BCM6358 and BCM6368.
44
In these SoCs there are Serial LEDs (LEDs connected to a 74x164 controller),
55
which can either be controlled by software (exporting the 74x164 as spi-gpio.
6-
See Documentation/devicetree/bindings/gpio/gpio-74x164.txt), or
6+
See Documentation/devicetree/bindings/gpio/fairchild,74hc595.yaml), or
77
by hardware using this driver.
88

99
Required properties:

Documentation/devicetree/bindings/media/renesas,drif.yaml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,32 +99,26 @@ properties:
9999
Indicates that the channel acts as primary among the bonded channels.
100100

101101
port:
102-
type: object
102+
$ref: /schemas/graph.yaml#/properties/port
103+
unevaluatedProperties: false
103104
description:
104-
Child port node corresponding to the data input, in accordance with the
105-
video interface bindings defined in
106-
Documentation/devicetree/bindings/media/video-interfaces.txt.
107-
The port node must contain at least one endpoint.
105+
Child port node corresponding to the data input. The port node must
106+
contain at least one endpoint.
108107

109108
properties:
110109
endpoint:
111-
type: object
110+
$ref: /schemas/graph.yaml#/$defs/endpoint-base
111+
unevaluatedProperties: false
112112

113113
properties:
114-
remote-endpoint:
115-
description:
116-
A phandle to the remote tuner endpoint subnode in remote node
117-
port.
118-
119114
sync-active:
115+
$ref: /schemas/types.yaml#/definitions/uint32
120116
enum: [0, 1]
121117
description:
122118
Indicates sync signal polarity, 0/1 for low/high respectively.
123119
This property maps to SYNCAC bit in the hardware manual. The
124120
default is 1 (active high).
125121

126-
additionalProperties: false
127-
128122
required:
129123
- compatible
130124
- reg

Documentation/devicetree/bindings/net/qcom,ipa.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ properties:
105105
- description: Whether the IPA clock is enabled (if valid)
106106

107107
qcom,smem-state-names:
108-
$ref: /schemas/types.yaml#/definitions/string-array
109108
description: The names of the state bits used for SMP2P output
110109
items:
111110
- const: ipa-clock-enabled-valid

Documentation/devicetree/bindings/nvmem/mtk-efuse.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Required properties:
99
"mediatek,mt8173-efuse" or "mediatek,efuse": for MT8173
1010
"mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
1111
"mediatek,mt8516-efuse", "mediatek,efuse": for MT8516
12-
"mediatek,mt8192-efuse", "mediatek,efuse": for MT8192
1312
- reg: Should contain registers location and length
1413

1514
= Data cells =

Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ patternProperties:
118118
description:
119119
Specifies the Spread Spectrum Clocking mode used. It can be NO_SSC,
120120
EXTERNAL_SSC or INTERNAL_SSC.
121-
Refer include/dt-bindings/phy/phy-cadence-torrent.h for the constants to be used.
121+
Refer include/dt-bindings/phy/phy-cadence.h for the constants to be used.
122122
$ref: /schemas/types.yaml#/definitions/uint32
123123
enum: [0, 1, 2]
124124
default: 0

0 commit comments

Comments
 (0)