Skip to content

Commit 5e5558f

Browse files
committed
Merge tag 'devicetree-fixes-for-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Fix potential memory leak in of_changeset_action() - Fix some i.MX binding warnings - Fix typo in renesas,vin binding field-even-active property - Fix andestech,ax45mp-cache example unit-address - Add missing additionalProperties on RiscV CPU interrupt-controller node - Add missing unevaluatedProperties on media bindings - Fix brcm,iproc-pcie binding 'msi' child node schema - Fix MEMSIC MXC4005 compatible string * tag 'devicetree-fixes-for-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: trivial-devices: Fix MEMSIC MXC4005 compatible string dt-bindings: PCI: brcm,iproc-pcie: Fix 'msi' child node schema dt-bindings: PCI: brcm,iproc-pcie: Drop common pci-bus properties dt-bindings: PCI: brcm,iproc-pcie: Fix example indentation media: dt-bindings: Add missing unevaluatedProperties on child node schemas dt-bindings: bus: fsl,imx8qxp-pixel-link-msi-bus: Drop child 'reg' property media: dt-bindings: imx7-csi: Make power-domains not required for imx8mq dt-bindings: media: renesas,vin: Fix field-even-active spelling dt-bindings: cache: andestech,ax45mp-cache: Fix unit address in example of: overlay: Reorder struct fragment fields kerneldoc dt-bindings: display: fsl,imx6-hdmi: Change to 'unevaluatedProperties: false' dt-bindings: riscv: cpus: Add missing additionalProperties on interrupt-controller node of: dynamic: Fix potential memory leak in of_changeset_action()
2 parents 2282337 + 19007c6 commit 5e5558f

File tree

13 files changed

+90
-100
lines changed

13 files changed

+90
-100
lines changed

Documentation/devicetree/bindings/bus/fsl,imx8qxp-pixel-link-msi-bus.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ patternProperties:
7373
"^.*@[0-9a-f]+$":
7474
description: Devices attached to the bus
7575
type: object
76-
properties:
77-
reg:
78-
maxItems: 1
7976

8077
required:
8178
- reg

Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ examples:
6969
- |
7070
#include <dt-bindings/interrupt-controller/irq.h>
7171
72-
cache-controller@2010000 {
72+
cache-controller@13400000 {
7373
compatible = "andestech,ax45mp-cache", "cache";
7474
reg = <0x13400000 0x100000>;
7575
interrupts = <508 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/display/imx/fsl,imx6-hdmi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ required:
8787
- interrupts
8888
- ports
8989

90-
additionalProperties: false
90+
unevaluatedProperties: false
9191

9292
examples:
9393
- |

Documentation/devicetree/bindings/media/i2c/sony,imx415.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ properties:
5454

5555
port:
5656
$ref: /schemas/graph.yaml#/$defs/port-base
57+
unevaluatedProperties: false
5758

5859
properties:
5960
endpoint:

Documentation/devicetree/bindings/media/i2c/toshiba,tc358746.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ properties:
6969
properties:
7070
port@0:
7171
$ref: /schemas/graph.yaml#/$defs/port-base
72+
unevaluatedProperties: false
7273
description: Input port
7374

7475
properties:
@@ -89,6 +90,7 @@ properties:
8990

9091
port@1:
9192
$ref: /schemas/graph.yaml#/$defs/port-base
93+
unevaluatedProperties: false
9294
description: Output port
9395

9496
properties:

Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ allOf:
5959
compatible:
6060
contains:
6161
enum:
62-
- fsl,imx8mq-csi
6362
- fsl,imx8mm-csi
6463
then:
6564
required:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ properties:
9595
synchronization is selected.
9696
default: 1
9797

98-
field-active-even: true
98+
field-even-active: true
9999

100100
bus-width: true
101101

@@ -144,7 +144,7 @@ properties:
144144
synchronization is selected.
145145
default: 1
146146

147-
field-active-even: true
147+
field-even-active: true
148148

149149
bus-width: true
150150

Documentation/devicetree/bindings/media/samsung,fimc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ properties:
5757
patternProperties:
5858
"^port@[01]$":
5959
$ref: /schemas/graph.yaml#/$defs/port-base
60+
unevaluatedProperties: false
6061
description:
6162
Camera A and camera B inputs.
6263

Documentation/devicetree/bindings/pci/brcm,iproc-pcie.yaml

Lines changed: 76 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ maintainers:
1212

1313
allOf:
1414
- $ref: /schemas/pci/pci-bus.yaml#
15-
- $ref: /schemas/interrupt-controller/msi-controller.yaml#
1615

1716
properties:
1817
compatible:
@@ -34,13 +33,6 @@ properties:
3433
description: >
3534
Base address and length of the PCIe controller I/O register space
3635
37-
interrupt-map: true
38-
39-
interrupt-map-mask: true
40-
41-
"#interrupt-cells":
42-
const: 1
43-
4436
ranges:
4537
minItems: 1
4638
maxItems: 2
@@ -54,16 +46,8 @@ properties:
5446
items:
5547
- const: pcie-phy
5648

57-
bus-range: true
58-
5949
dma-coherent: true
6050

61-
"#address-cells": true
62-
63-
"#size-cells": true
64-
65-
device_type: true
66-
6751
brcm,pcie-ob:
6852
type: boolean
6953
description: >
@@ -78,20 +62,24 @@ properties:
7862
7963
msi:
8064
type: object
65+
$ref: /schemas/interrupt-controller/msi-controller.yaml#
66+
unevaluatedProperties: false
67+
8168
properties:
8269
compatible:
8370
items:
8471
- const: brcm,iproc-msi
8572

86-
msi-parent: true
73+
interrupts:
74+
maxItems: 4
8775

88-
msi-controller: true
76+
brcm,pcie-msi-inten:
77+
type: boolean
78+
description:
79+
Needs to be present for some older iProc platforms that require the
80+
interrupt enable registers to be set explicitly to enable MSI
8981

90-
brcm,pcie-msi-inten:
91-
type: boolean
92-
description: >
93-
Needs to be present for some older iProc platforms that require the
94-
interrupt enable registers to be set explicitly to enable MSI
82+
msi-parent: true
9583

9684
dependencies:
9785
brcm,pcie-ob-axi-offset: ["brcm,pcie-ob"]
@@ -117,68 +105,69 @@ unevaluatedProperties: false
117105

118106
examples:
119107
- |
120-
#include <dt-bindings/interrupt-controller/arm-gic.h>
121-
122-
bus {
123-
#address-cells = <1>;
124-
#size-cells = <1>;
125-
pcie0: pcie@18012000 {
126-
compatible = "brcm,iproc-pcie";
127-
reg = <0x18012000 0x1000>;
128-
129-
#interrupt-cells = <1>;
130-
interrupt-map-mask = <0 0 0 0>;
131-
interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>;
132-
133-
linux,pci-domain = <0>;
134-
135-
bus-range = <0x00 0xff>;
136-
137-
#address-cells = <3>;
138-
#size-cells = <2>;
139-
device_type = "pci";
140-
ranges = <0x81000000 0 0 0x28000000 0 0x00010000>,
141-
<0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
142-
143-
phys = <&phy 0 5>;
144-
phy-names = "pcie-phy";
145-
146-
brcm,pcie-ob;
147-
brcm,pcie-ob-axi-offset = <0x00000000>;
148-
149-
msi-parent = <&msi0>;
150-
151-
/* iProc event queue based MSI */
152-
msi0: msi {
153-
compatible = "brcm,iproc-msi";
154-
msi-controller;
155-
interrupt-parent = <&gic>;
156-
interrupts = <GIC_SPI 96 IRQ_TYPE_NONE>,
157-
<GIC_SPI 97 IRQ_TYPE_NONE>,
158-
<GIC_SPI 98 IRQ_TYPE_NONE>,
159-
<GIC_SPI 99 IRQ_TYPE_NONE>;
160-
};
161-
};
162-
163-
pcie1: pcie@18013000 {
164-
compatible = "brcm,iproc-pcie";
165-
reg = <0x18013000 0x1000>;
166-
167-
#interrupt-cells = <1>;
168-
interrupt-map-mask = <0 0 0 0>;
169-
interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>;
170-
171-
linux,pci-domain = <1>;
172-
173-
bus-range = <0x00 0xff>;
174-
175-
#address-cells = <3>;
176-
#size-cells = <2>;
177-
device_type = "pci";
178-
ranges = <0x81000000 0 0 0x48000000 0 0x00010000>,
179-
<0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
180-
181-
phys = <&phy 1 6>;
182-
phy-names = "pcie-phy";
183-
};
108+
#include <dt-bindings/interrupt-controller/arm-gic.h>
109+
110+
gic: interrupt-controller {
111+
interrupt-controller;
112+
#interrupt-cells = <3>;
113+
};
114+
115+
pcie@18012000 {
116+
compatible = "brcm,iproc-pcie";
117+
reg = <0x18012000 0x1000>;
118+
119+
#interrupt-cells = <1>;
120+
interrupt-map-mask = <0 0 0 0>;
121+
interrupt-map = <0 0 0 0 &gic GIC_SPI 100 IRQ_TYPE_NONE>;
122+
123+
linux,pci-domain = <0>;
124+
125+
bus-range = <0x00 0xff>;
126+
127+
#address-cells = <3>;
128+
#size-cells = <2>;
129+
device_type = "pci";
130+
ranges = <0x81000000 0 0 0x28000000 0 0x00010000>,
131+
<0x82000000 0 0x20000000 0x20000000 0 0x04000000>;
132+
133+
phys = <&phy 0 5>;
134+
phy-names = "pcie-phy";
135+
136+
brcm,pcie-ob;
137+
brcm,pcie-ob-axi-offset = <0x00000000>;
138+
139+
msi-parent = <&msi0>;
140+
141+
/* iProc event queue based MSI */
142+
msi0: msi {
143+
compatible = "brcm,iproc-msi";
144+
msi-controller;
145+
interrupt-parent = <&gic>;
146+
interrupts = <GIC_SPI 96 IRQ_TYPE_NONE>,
147+
<GIC_SPI 97 IRQ_TYPE_NONE>,
148+
<GIC_SPI 98 IRQ_TYPE_NONE>,
149+
<GIC_SPI 99 IRQ_TYPE_NONE>;
150+
};
151+
};
152+
- |
153+
pcie@18013000 {
154+
compatible = "brcm,iproc-pcie";
155+
reg = <0x18013000 0x1000>;
156+
157+
#interrupt-cells = <1>;
158+
interrupt-map-mask = <0 0 0 0>;
159+
interrupt-map = <0 0 0 0 &gic GIC_SPI 106 IRQ_TYPE_NONE>;
160+
161+
linux,pci-domain = <1>;
162+
163+
bus-range = <0x00 0xff>;
164+
165+
#address-cells = <3>;
166+
#size-cells = <2>;
167+
device_type = "pci";
168+
ranges = <0x81000000 0 0 0x48000000 0 0x00010000>,
169+
<0x82000000 0 0x40000000 0x40000000 0 0x04000000>;
170+
171+
phys = <&phy 1 6>;
172+
phy-names = "pcie-phy";
184173
};

Documentation/devicetree/bindings/riscv/cpus.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ properties:
9191

9292
interrupt-controller:
9393
type: object
94+
additionalProperties: false
9495
description: Describes the CPU's local interrupt controller
9596

9697
properties:

0 commit comments

Comments
 (0)