Commit 105131df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dt-fixes-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt 

Pull devicetree binding fixes from Krzysztof Kozlowski:
 "A few fixes for Devicetree bindings and related docs, all for issues
  introduced in v6.4-rc1 commits:

   - media/ov2685: fix number of possible data lanes, as old binding
     explicitly mentioned one data lane. This fixes dt_binding_check
     warnings like:

       Documentation/devicetree/bindings/media/rockchip-isp1.example.dtb: camera@3c: port:endpoint:data-lanes: [[1]] is too short
       From schema: Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml

   - PCI/fsl,imx6q: correct parsing of assigned-clocks and related
     properties and make the clocks more specific per PCI device (host
     or endpoint). This fixes dtschema limitation and dt_binding_check
     warnings like:

       Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.example.dtb: pcie-ep@33800000: Unevaluated properties are not allowed
       From schema: Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml

   - Maintainers: correct path of Apple PWM binding. This fixes
     refcheckdocs warning"

* tag 'dt-fixes-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt:
  dt-bindings: PCI: fsl,imx6q: fix assigned-clocks warning
  MAINTAINERS: adjust file entry for ARM/APPLE MACHINE SUPPORT
  media: dt-bindings: ov2685: Correct data-lanes attribute
parents 6e27831b 8bbec86c

Documentation/devicetree/bindings/media/i2c/ovti,ov2685.yaml

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ properties: 


        properties:

          data-lanes:

            minItems: 1

            maxItems: 2



        required:

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-common.yaml

+2 −11
Original line number Diff line number Diff line
@@ -17,20 +17,11 @@ description: 
properties:

  clocks:

    minItems: 3

    items:

      - description: PCIe bridge clock.

      - description: PCIe bus clock.

      - description: PCIe PHY clock.

      - description: Additional required clock entry for imx6sx-pcie,

           imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep.

    maxItems: 4



  clock-names:

    minItems: 3

    items:

      - const: pcie

      - const: pcie_bus

      - enum: [ pcie_phy, pcie_aux ]

      - enum: [ pcie_inbound_axi, pcie_aux ]

    maxItems: 4



  num-lanes:

    const: 1

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml

+38 −0
Original line number Diff line number Diff line
@@ -31,6 +31,19 @@ properties: 
      - const: dbi

      - const: addr_space



  clocks:

    minItems: 3

    items:

      - description: PCIe bridge clock.

      - description: PCIe bus clock.

      - description: PCIe PHY clock.

      - description: Additional required clock entry for imx6sx-pcie,

           imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep.



  clock-names:

    minItems: 3

    maxItems: 4



  interrupts:

    items:

      - description: builtin eDMA interrupter.
@@ -49,6 +62,31 @@ required: 
allOf:

  - $ref: /schemas/pci/snps,dw-pcie-ep.yaml#

  - $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml#

  - if:

      properties:

        compatible:

          enum:

            - fsl,imx8mq-pcie-ep

    then:

      properties:

        clocks:

          minItems: 4

        clock-names:

          items:

            - const: pcie

            - const: pcie_bus

            - const: pcie_phy

            - const: pcie_aux

    else:

      properties:

        clocks:

          maxItems: 3

        clock-names:

          items:

            - const: pcie

            - const: pcie_bus

            - const: pcie_aux





unevaluatedProperties: false

Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.yaml

+77 −0
Original line number Diff line number Diff line
@@ -40,6 +40,19 @@ properties: 
      - const: dbi

      - const: config



  clocks:

    minItems: 3

    items:

      - description: PCIe bridge clock.

      - description: PCIe bus clock.

      - description: PCIe PHY clock.

      - description: Additional required clock entry for imx6sx-pcie,

           imx6sx-pcie-ep, imx8mq-pcie, imx8mq-pcie-ep.



  clock-names:

    minItems: 3

    maxItems: 4



  interrupts:

    items:

      - description: builtin MSI controller.
@@ -77,6 +90,70 @@ required: 
allOf:

  - $ref: /schemas/pci/snps,dw-pcie.yaml#

  - $ref: /schemas/pci/fsl,imx6q-pcie-common.yaml#

  - if:

      properties:

        compatible:

          enum:

            - fsl,imx6sx-pcie

    then:

      properties:

        clocks:

          minItems: 4

        clock-names:

          items:

            - const: pcie

            - const: pcie_bus

            - const: pcie_phy

            - const: pcie_inbound_axi



  - if:

      properties:

        compatible:

          enum:

            - fsl,imx8mq-pcie

    then:

      properties:

        clocks:

          minItems: 4

        clock-names:

          items:

            - const: pcie

            - const: pcie_bus

            - const: pcie_phy

            - const: pcie_aux



  - if:

      properties:

        compatible:

          enum:

            - fsl,imx6q-pcie

            - fsl,imx6qp-pcie

            - fsl,imx7d-pcie

    then:

      properties:

        clocks:

          maxItems: 3

        clock-names:

          items:

            - const: pcie

            - const: pcie_bus

            - const: pcie_phy



  - if:

      properties:

        compatible:

          enum:

            - fsl,imx8mm-pcie

            - fsl,imx8mp-pcie

    then:

      properties:

        clocks:

          maxItems: 3

        clock-names:

          items:

            - const: pcie

            - const: pcie_bus

            - const: pcie_aux



unevaluatedProperties: false

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1970,7 +1970,7 @@ F: Documentation/devicetree/bindings/nvmem/apple,efuses.yaml 
F:	Documentation/devicetree/bindings/pci/apple,pcie.yaml

F:	Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml

F:	Documentation/devicetree/bindings/power/apple*

F:	Documentation/devicetree/bindings/pwm/pwm-apple.yaml

F:	Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml

F:	Documentation/devicetree/bindings/watchdog/apple,wdt.yaml

F:	arch/arm64/boot/dts/apple/

F:	drivers/bluetooth/hci_bcm4377.c