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

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

Pull more Devicetree fixes from Rob Herring:
 "A couple of schema and kbuild fixes"

* tag 'devicetree-fixes-for-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: phy: qcom-qusb2: Fix defaults
  dt-bindings: Fix erroneous 'additionalProperties'
  dt-bindings: Fix command line length limit calling dt-mk-schema
  dt-bindings: Re-enable core schemas for dtbs_check
parents b2768df2 4bc77b2d

Documentation/devicetree/bindings/Makefile

+12 −9
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
DT_DOC_CHECKER ?= dt-doc-validate

DT_EXTRACT_EX ?= dt-extract-example

DT_MK_SCHEMA ?= dt-mk-schema

DT_MK_SCHEMA_USERONLY_FLAG := $(if $(DT_SCHEMA_FILES), -u)



quiet_cmd_chk_binding = CHKDT   $(patsubst $(srctree)/%,%,$<)

      cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \
@@ -13,16 +14,18 @@ $(obj)/%.example.dts: $(src)/%.yaml FORCE 
# Use full schemas when checking %.example.dts

DT_TMP_SCHEMA := $(obj)/processed-schema-examples.yaml



find_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \

		-name 'processed-schema*' ! \

		-name '*.example.dt.yaml' \)



quiet_cmd_mk_schema = SCHEMA  $@

      cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(real-prereqs)

      cmd_mk_schema = rm -f $@ ; \

                      $(if $(DT_MK_SCHEMA_FLAGS), \

                           echo $(real-prereqs), \

                           $(find_cmd)) | \

                      xargs $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) >> $@



DT_DOCS = $(addprefix $(src)/, \

	$(shell \

	cd $(srctree)/$(src) && \

	find * \( -name '*.yaml' ! \

		-name 'processed-schema*' ! \

		-name '*.example.dt.yaml' \) \

	))

DT_DOCS = $(shell $(find_cmd) | sed -e 's|^$(srctree)/||')



DT_SCHEMA_FILES ?= $(DT_DOCS)
@@ -37,7 +40,7 @@ override DTC_FLAGS := \ 
$(obj)/processed-schema-examples.yaml: $(DT_DOCS) FORCE

	$(call if_changed,mk_schema)



$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := -u

$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := $(DT_MK_SCHEMA_USERONLY_FLAG)

$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) FORCE

	$(call if_changed,mk_schema)

Documentation/devicetree/bindings/mfd/st,stpmic1.yaml

+0 −2
Original line number Diff line number Diff line
@@ -261,8 +261,6 @@ properties: 


additionalProperties: false



additionalProperties: false



required:

  - compatible

  - reg

Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml

+3 −3
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ then: 
        - $ref: /schemas/types.yaml#/definitions/uint32

        - minimum: 0

          maximum: 63

          default: 0

          default: 32



    qcom,charge-ctrl-value:

     description:
@@ -130,7 +130,7 @@ then: 
        - $ref: /schemas/types.yaml#/definitions/uint32

        - minimum: 0

          maximum: 3

          default: 2

          default: 0



    qcom,preemphasis-width:

      description:
@@ -152,7 +152,7 @@ then: 
        - $ref: /schemas/types.yaml#/definitions/uint32

        - minimum: 0

          maximum: 3

          default: 0

          default: 1



required:

  - compatible

Documentation/devicetree/bindings/regulator/mps,mp5416.yaml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ properties: 
        type: object



    additionalProperties: false

  additionalProperties: false



required:

  - compatible

Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml

+2 −1
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ properties: 
            description: |

              disables over voltage protection of this buck



      additionalProperties: false

        unevaluatedProperties: false



    additionalProperties: false



required:

CRA Git | Maintained and supported by SUSTech CRA and CCSE