Skip to content

Commit

Permalink
Merge tag 'devicetree-fixes-for-6.15-1' of git://git.kernel.org/pub/s…
Browse files Browse the repository at this point in the history
…cm/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
  • Loading branch information
Linus Torvalds committed Apr 16, 2025
2 parents c62f4b8 + d5f4992 commit c133686
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 76 deletions.
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Ceva AHCI SATA Controller

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

description: |
Expand Down
18 changes: 17 additions & 1 deletion Documentation/devicetree/bindings/display/bridge/nwl-dsi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,27 @@ properties:
unevaluatedProperties: false

port@1:
$ref: /schemas/graph.yaml#/properties/port
$ref: /schemas/graph.yaml#/$defs/port-base
unevaluatedProperties: false
description:
DSI output port node to the panel or the next bridge
in the chain

properties:
endpoint:
$ref: /schemas/media/video-interfaces.yaml#
unevaluatedProperties: false

properties:
data-lanes:
description: array of physical DSI data lane indexes.
minItems: 1
items:
- const: 1
- const: 2
- const: 3
- const: 4

required:
- port@0
- port@1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ description:
PS_MODE). Every pin can be configured as input/output.

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

properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ properties:
- fsl,imx8mp-irqsteer
- fsl,imx8qm-irqsteer
- fsl,imx8qxp-irqsteer
- fsl,imx94-irqsteer
- const: fsl,imx-irqsteer

reg:
Expand Down
9 changes: 0 additions & 9 deletions Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@ title: Renesas R-Car Timer Pulse Unit PWM Controller
maintainers:
- Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

select:
properties:
compatible:
contains:
const: renesas,tpu
required:
- compatible
- '#pwm-cells'

properties:
compatible:
items:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Zynq UltraScale+ MPSoC and Versal reset

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

description: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Freescale Layerscape Reset Registers Module

maintainers:
- Frank Li
- Frank Li <Frank.Li@nxp.com>

description:
Reset Module includes chip reset, service processor control and Reset Control
Expand Down
11 changes: 8 additions & 3 deletions Documentation/devicetree/bindings/timer/nxp,sysctr-timer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ description: |
properties:
compatible:
enum:
- nxp,imx95-sysctr-timer
- nxp,sysctr-timer
oneOf:
- enum:
- nxp,imx95-sysctr-timer
- nxp,sysctr-timer
- items:
- enum:
- nxp,imx94-sysctr-timer
- const: nxp,imx95-sysctr-timer

reg:
maxItems: 1
Expand Down
56 changes: 0 additions & 56 deletions Documentation/devicetree/bindings/timer/renesas,tpu.yaml

This file was deleted.

1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/usb/dwc3-xilinx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Xilinx SuperSpeed DWC3 USB SoC controller

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

properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ description:

maintainers:
- Michal Simek <michal.simek@amd.com>
- Mubin Sayyed <mubin.sayyed@amd.com>
- Radhey Shyam Pandey <radhey.shyam.pandey@amd.com>

properties:
Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/usb/xlnx,usb2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Xilinx udc controller

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

properties:
Expand Down

0 comments on commit c133686

Please sign in to comment.