Commit d5c0b601 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-fixes-for-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull devicetree fixes from Rob Herring:

 - Fix dt-extract-compatibles for builds with in tree build directory

 - Drop Xinlei Lee <xinlei.lee@mediatek.com> bouncing email

 - Fix the of_reconfig_get_state_change() return value documentation

 - Add missing #power-domain-cells property to QCom MPM

 - Fix warnings in i.MX LCDIF and adi,adv7533

* tag 'devicetree-fixes-for-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: display: adi,adv75xx: Document #sound-dai-cells
  dt-bindings: lcdif: Properly describe the i.MX23 interrupts
  dt-bindings: interrupt-controller: Allow #power-domain-cells
  of: dynamic: Fix of_reconfig_get_state_change() return value documentation
  dt-bindings: display: mediatek: dsi: remove Xinlei's mail
  dt: dt-extract-compatibles: Don't follow symlinks when walking tree
parents 33d42bde 136c6531

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Analog Devices ADV7533/35 HDMI Encoders 
maintainers:

  - Laurent Pinchart <laurent.pinchart@ideasonboard.com>



allOf:

  - $ref: /schemas/sound/dai-common.yaml#



description: |

  The ADV7533 and ADV7535 are HDMI audio and video transmitters

  compatible with HDMI 1.4 and DVI 1.0. They support color space
@@ -89,6 +92,9 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [ 1, 2, 3, 4 ]



  "#sound-dai-cells":

    const: 0



  ports:

    description:

      The ADV7533/35 has two video ports and one audio port.

Documentation/devicetree/bindings/display/fsl,lcdif.yaml

+19 −1
Original line number Diff line number Diff line
@@ -51,7 +51,10 @@ properties: 
    minItems: 1



  interrupts:

    maxItems: 1

    items:

      - description: LCDIF DMA interrupt

      - description: LCDIF Error interrupt

    minItems: 1



  power-domains:

    maxItems: 1
@@ -131,6 +134,21 @@ allOf: 
    then:

      required:

        - power-domains

  - if:

      properties:

        compatible:

          contains:

            enum:

              - fsl,imx23-lcdif

    then:

      properties:

        interrupts:

          minItems: 2

          maxItems: 2

    else:

      properties:

        interrupts:

          maxItems: 1



examples:

  - |

Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.yaml

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ maintainers: 
  - Chun-Kuang Hu <chunkuang.hu@kernel.org>

  - Philipp Zabel <p.zabel@pengutronix.de>

  - Jitao Shi <jitao.shi@mediatek.com>

  - Xinlei Lee <xinlei.lee@mediatek.com>



description: |

  The MediaTek DSI function block is a sink of the display subsystem and can

Documentation/devicetree/bindings/interrupt-controller/qcom,mpm.yaml

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ properties: 
        - description: MPM pin number

        - description: GIC SPI number for the MPM pin



  '#power-domain-cells':

    const: 0



required:

  - compatible

  - reg
@@ -93,4 +96,5 @@ examples: 
                           <86 183>,

                           <90 260>,

                           <91 260>;

        #power-domain-cells = <0>;

    };

drivers/of/dynamic.c

+3 −2
Original line number Diff line number Diff line
@@ -98,8 +98,9 @@ int of_reconfig_notify(unsigned long action, struct of_reconfig_data *p) 
 *

 * Returns the new state of a device based on the notifier used.

 *

 * Return: 0 on device going from enabled to disabled, 1 on device

 * going from disabled to enabled and -1 on no change.

 * Return: OF_RECONFIG_CHANGE_REMOVE on device going from enabled to

 * disabled, OF_RECONFIG_CHANGE_ADD on device going from disabled to

 * enabled and OF_RECONFIG_NO_CHANGE on no change.

 */

int of_reconfig_get_state_change(unsigned long action, struct of_reconfig_data *pr)

{