Commit 6c833c05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull devicetree fixes from Rob Herring:

 - Fix schema warnings in qcom,ipq6018-pinctrl and sdhci-msm

 - Convert Qualcomm SPMI PMIC to DT schema

 - Make secure interrupt optional for arm,mhu

 - Fix google,cros-ec-typec binding allowed properties

 - Update a bunch of bouncing email addresses

* tag 'devicetree-fixes-for-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: chrome: google,cros-ec-typec: restrict allowed properties
  dt-bindings: Drop Dan Murphy and Ricardo Rivera-Matos
  dt-bindings: Drop Robert Jones
  dt-bindings: Drop Beniamin Bia and Stefan Popa
  dt-bindings: iio: Drop Bogdan Pricop
  dt-bindings: iio: Drop Joachim Eastwood
  dt-bindings: mailbox: arm,mhu: Make secure interrupt optional
  dt-bindings: pinctrl: qcom,ipq6018: Fix example 'gpio-ranges' size
  dt-bindings: Drop DT_MK_SCHEMA_FLAGS conditional selecting schema files
  dt-bindings: mfd: convert to yaml Qualcomm SPMI PMIC
  dt-bindings: mmc: sdhci-msm: Fix 'operating-points-v2 was unexpected' issue
  dt-bindings: display: simple-framebuffer: Drop Bartlomiej Zolnierkiewicz
parents 3d076fec 8f426582

Documentation/devicetree/bindings/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -42,9 +42,7 @@ quiet_cmd_chk_bindings = CHKDT $@ 


quiet_cmd_mk_schema = SCHEMA  $@

      cmd_mk_schema = f=$$(mktemp) ; \

                      $(if $(DT_MK_SCHEMA_FLAGS), \

                           printf '%s\n' $(real-prereqs), \

                           $(find_all_cmd)) > $$f ; \

                      $(find_all_cmd) > $$f ; \

                      $(DT_MK_SCHEMA) -j $(DT_MK_SCHEMA_FLAGS) @$$f > $@ ; \

		      rm -f $$f

Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml

+13 −2
Original line number Diff line number Diff line
@@ -20,13 +20,24 @@ properties: 
  compatible:

    const: google,cros-ec-typec



  connector:

  '#address-cells':

    const: 1



  '#size-cells':

    const: 0



patternProperties:

  '^connector@[0-9a-f]+$':

    $ref: /schemas/connector/usb-connector.yaml#

    unevaluatedProperties: false

    properties:

      reg:

        maxItems: 1



required:

  - compatible



additionalProperties: true #fixme

additionalProperties: false



examples:

  - |+

Documentation/devicetree/bindings/display/simple-framebuffer.yaml

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Simple Framebuffer Device Tree Bindings



maintainers:

  - Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

  - Hans de Goede <hdegoede@redhat.com>



description: |+

Documentation/devicetree/bindings/hwmon/adi,adm1177.yaml

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ title: Analog Devices ADM1177 Hot Swap Controller and Digital Power Monitor 


maintainers:

  - Michael Hennerich <michael.hennerich@analog.com>

  - Beniamin Bia <beniamin.bia@analog.com>



description: |

  Analog Devices ADM1177 Hot Swap Controller and Digital Power Monitor

Documentation/devicetree/bindings/iio/accel/fsl,mma7455.yaml

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Freescale MMA7455 and MMA7456 three axis accelerometers



maintainers:

  - Joachim Eastwood <manabian@gmail.com>

  - Jonathan Cameron <jic23@kernel.org>



description: