Skip to content

Commit 2423e14

Browse files
committed
Merge tag 'devicetree-fixes-for-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Several Renesas binding fixes to fix warnings - Remove duplicate compatibles in 8250 binding - Remove orphaned Sigma Designs Tango bindings - Fix bcm2711-hdmi binding to use 'additionalProperties' - Fix idt,32434-pic warning for missing 'interrupts' property - Fix 'stored but not read' warnings in DT overlay code * tag 'devicetree-fixes-for-5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: net: renesas,etheravb: Fix optional second clock name dt-bindings: display: renesas,du: Add missing power-domains property dt-bindings: media: renesas,vin: Make resets optional on R-Car Gen1 dt-bindings: PCI: rcar-pci-host: Document missing R-Car H1 support of: overlay: Remove redundant assignment to ret dt-bindings: serial: 8250: Remove duplicated compatible strings dt-bindings: Remove unused Sigma Designs Tango bindings dt-bindings: bcm2711-hdmi: Fix broken schema dt-bindings: interrupt-controller: idt,32434-pic: Add missing interrupts property
2 parents 322a3b8 + 6799e3f commit 2423e14

File tree

10 files changed

+49
-95
lines changed

10 files changed

+49
-95
lines changed

Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ required:
109109
- resets
110110
- ddc
111111

112-
unevaluatedProperties: false
112+
additionalProperties: false
113113

114114
examples:
115115
- |

Documentation/devicetree/bindings/display/renesas,du.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ properties:
5151
resets: true
5252
reset-names: true
5353

54+
power-domains:
55+
maxItems: 1
56+
5457
ports:
5558
$ref: /schemas/graph.yaml#/properties/port
5659
description: |

Documentation/devicetree/bindings/interrupt-controller/idt,32434-pic.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,17 @@ properties:
2222
reg:
2323
maxItems: 1
2424

25+
interrupts:
26+
maxItems: 1
27+
2528
interrupt-controller: true
2629

2730
required:
2831
- "#interrupt-cells"
2932
- compatible
3033
- reg
3134
- interrupt-controller
35+
- interrupts
3236

3337
additionalProperties: false
3438

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

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -193,23 +193,35 @@ required:
193193
- interrupts
194194
- clocks
195195
- power-domains
196-
- resets
197-
198-
if:
199-
properties:
200-
compatible:
201-
contains:
202-
enum:
203-
- renesas,vin-r8a7778
204-
- renesas,vin-r8a7779
205-
- renesas,rcar-gen2-vin
206-
then:
207-
required:
208-
- port
209-
else:
210-
required:
211-
- renesas,id
212-
- ports
196+
197+
allOf:
198+
- if:
199+
not:
200+
properties:
201+
compatible:
202+
contains:
203+
enum:
204+
- renesas,vin-r8a7778
205+
- renesas,vin-r8a7779
206+
then:
207+
required:
208+
- resets
209+
210+
- if:
211+
properties:
212+
compatible:
213+
contains:
214+
enum:
215+
- renesas,vin-r8a7778
216+
- renesas,vin-r8a7779
217+
- renesas,rcar-gen2-vin
218+
then:
219+
required:
220+
- port
221+
else:
222+
required:
223+
- renesas,id
224+
- ports
213225

214226
additionalProperties: false
215227

Documentation/devicetree/bindings/mtd/tango-nand.txt

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

Documentation/devicetree/bindings/net/renesas,etheravb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ properties:
5151

5252
clocks:
5353
minItems: 1
54-
maxItems: 2
5554
items:
5655
- description: AVB functional clock
5756
- description: Optional TXC reference clock
5857

5958
clock-names:
59+
minItems: 1
6060
items:
6161
- const: fck
6262
- const: refclk

Documentation/devicetree/bindings/pci/rcar-pci-host.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ allOf:
1717
properties:
1818
compatible:
1919
oneOf:
20+
- const: renesas,pcie-r8a7779 # R-Car H1
2021
- items:
2122
- enum:
2223
- renesas,pcie-r8a7742 # RZ/G1H
@@ -74,7 +75,16 @@ required:
7475
- clocks
7576
- clock-names
7677
- power-domains
77-
- resets
78+
79+
if:
80+
not:
81+
properties:
82+
compatible:
83+
contains:
84+
const: renesas,pcie-r8a7779
85+
then:
86+
required:
87+
- resets
7888

7989
unevaluatedProperties: false
8090

Documentation/devicetree/bindings/pci/tango-pcie.txt

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

Documentation/devicetree/bindings/serial/8250.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,6 @@ properties:
9999
- mediatek,mt7622-btif
100100
- mediatek,mt7623-btif
101101
- const: mediatek,mtk-btif
102-
- items:
103-
- enum:
104-
- mediatek,mt7622-btif
105-
- mediatek,mt7623-btif
106-
- const: mediatek,mtk-btif
107102
- items:
108103
- const: mrvl,mmp-uart
109104
- const: intel,xscale-uart

drivers/of/overlay.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,6 @@ int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size,
10241024
struct device_node *overlay_root = NULL;
10251025

10261026
*ovcs_id = 0;
1027-
ret = 0;
10281027

10291028
if (overlay_fdt_size < sizeof(struct fdt_header) ||
10301029
fdt_check_header(overlay_fdt)) {
@@ -1195,8 +1194,6 @@ int of_overlay_remove(int *ovcs_id)
11951194
struct overlay_changeset *ovcs;
11961195
int ret, ret_apply, ret_tmp;
11971196

1198-
ret = 0;
1199-
12001197
if (devicetree_corrupt()) {
12011198
pr_err("suspect devicetree state, refuse to remove overlay\n");
12021199
ret = -EBUSY;

0 commit comments

Comments
 (0)