Skip to content

Commit c133686

Browse files
committed
Merge tag 'devicetree-fixes-for-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - A couple of maintainers updates - Remove obsolete Renesas TPU timer binding - Add i.MX94 support to nxp,sysctr-timer and fsl,irqsteer - Add support for 'data-lanes' property in fsl,imx8mq-nwl-dsi binding * tag 'devicetree-fixes-for-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: soc: fsl: fsl,ls1028a-reset: Fix maintainer entry dt-bindings: timer: renesas,tpu: remove obsolete binding dt-bindings: timer: nxp,sysctr-timer: Add i.MX94 support dt-bindings: interrupt-controller: fsl,irqsteer: Add i.MX94 support dt-bindings: display: nwl-dsi: Allow 'data-lanes' property for port@1 dt-bindings: xilinx: Remove myself from maintainership
2 parents c62f4b8 + d5f4992 commit c133686

File tree

12 files changed

+27
-76
lines changed

12 files changed

+27
-76
lines changed

Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Ceva AHCI SATA Controller
88

99
maintainers:
10-
- Mubin Sayyed <mubin.sayyed@amd.com>
1110
- Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
1211

1312
description: |

Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,27 @@ properties:
111111
unevaluatedProperties: false
112112

113113
port@1:
114-
$ref: /schemas/graph.yaml#/properties/port
114+
$ref: /schemas/graph.yaml#/$defs/port-base
115+
unevaluatedProperties: false
115116
description:
116117
DSI output port node to the panel or the next bridge
117118
in the chain
118119

120+
properties:
121+
endpoint:
122+
$ref: /schemas/media/video-interfaces.yaml#
123+
unevaluatedProperties: false
124+
125+
properties:
126+
data-lanes:
127+
description: array of physical DSI data lane indexes.
128+
minItems: 1
129+
items:
130+
- const: 1
131+
- const: 2
132+
- const: 3
133+
- const: 4
134+
119135
required:
120136
- port@0
121137
- port@1

Documentation/devicetree/bindings/gpio/xlnx,zynqmp-gpio-modepin.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ description:
1212
PS_MODE). Every pin can be configured as input/output.
1313

1414
maintainers:
15-
- Mubin Sayyed <mubin.sayyed@amd.com>
1615
- Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
1716

1817
properties:

Documentation/devicetree/bindings/interrupt-controller/fsl,irqsteer.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- fsl,imx8mp-irqsteer
2020
- fsl,imx8qm-irqsteer
2121
- fsl,imx8qxp-irqsteer
22+
- fsl,imx94-irqsteer
2223
- const: fsl,imx-irqsteer
2324

2425
reg:

Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ title: Renesas R-Car Timer Pulse Unit PWM Controller
99
maintainers:
1010
- Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
1111

12-
select:
13-
properties:
14-
compatible:
15-
contains:
16-
const: renesas,tpu
17-
required:
18-
- compatible
19-
- '#pwm-cells'
20-
2112
properties:
2213
compatible:
2314
items:

Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Zynq UltraScale+ MPSoC and Versal reset
88

99
maintainers:
10-
- Mubin Sayyed <mubin.sayyed@amd.com>
1110
- Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
1211

1312
description: |

Documentation/devicetree/bindings/soc/fsl/fsl,ls1028a-reset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Freescale Layerscape Reset Registers Module
88

99
maintainers:
10-
- Frank Li
10+
- Frank Li <Frank.Li@nxp.com>
1111

1212
description:
1313
Reset Module includes chip reset, service processor control and Reset Control

Documentation/devicetree/bindings/timer/nxp,sysctr-timer.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,14 @@ description: |
1818
1919
properties:
2020
compatible:
21-
enum:
22-
- nxp,imx95-sysctr-timer
23-
- nxp,sysctr-timer
21+
oneOf:
22+
- enum:
23+
- nxp,imx95-sysctr-timer
24+
- nxp,sysctr-timer
25+
- items:
26+
- enum:
27+
- nxp,imx94-sysctr-timer
28+
- const: nxp,imx95-sysctr-timer
2429

2530
reg:
2631
maxItems: 1

Documentation/devicetree/bindings/timer/renesas,tpu.yaml

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

Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx SuperSpeed DWC3 USB SoC controller
88

99
maintainers:
10-
- Mubin Sayyed <mubin.sayyed@amd.com>
1110
- Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>
1211

1312
properties:

0 commit comments

Comments
 (0)