tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'dt/linus' into 'dt/next'

Rob Herring 04063666 7456427a

+33 -20
+13 -10
Documentation/devicetree/bindings/Makefile
··· 2 2 DT_DOC_CHECKER ?= dt-doc-validate 3 3 DT_EXTRACT_EX ?= dt-extract-example 4 4 DT_MK_SCHEMA ?= dt-mk-schema 5 + DT_MK_SCHEMA_USERONLY_FLAG := $(if $(DT_SCHEMA_FILES), -u) 5 6 6 7 quiet_cmd_chk_binding = CHKDT $(patsubst $(srctree)/%,%,$<) 7 8 cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \ ··· 14 13 # Use full schemas when checking %.example.dts 15 14 DT_TMP_SCHEMA := $(obj)/processed-schema-examples.yaml 16 15 17 - quiet_cmd_mk_schema = SCHEMA $@ 18 - cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(real-prereqs) 19 - 20 - DT_DOCS = $(addprefix $(src)/, \ 21 - $(shell \ 22 - cd $(srctree)/$(src) && \ 23 - find * \( -name '*.yaml' ! \ 16 + find_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \ 24 17 -name 'processed-schema*' ! \ 25 - -name '*.example.dt.yaml' \) \ 26 - )) 18 + -name '*.example.dt.yaml' \) 19 + 20 + quiet_cmd_mk_schema = SCHEMA $@ 21 + cmd_mk_schema = rm -f $@ ; \ 22 + $(if $(DT_MK_SCHEMA_FLAGS), \ 23 + echo $(real-prereqs), \ 24 + $(find_cmd)) | \ 25 + xargs $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) >> $@ 26 + 27 + DT_DOCS = $(shell $(find_cmd) | sed -e 's|^$(srctree)/||') 27 28 28 29 DT_SCHEMA_FILES ?= $(DT_DOCS) 29 30 ··· 40 37 $(obj)/processed-schema-examples.yaml: $(DT_DOCS) FORCE 41 38 $(call if_changed,mk_schema) 42 39 43 - $(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := -u 40 + $(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := $(DT_MK_SCHEMA_USERONLY_FLAG) 44 41 $(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) FORCE 45 42 $(call if_changed,mk_schema) 46 43
-2
Documentation/devicetree/bindings/mfd/st,stpmic1.yaml
··· 259 259 260 260 additionalProperties: false 261 261 262 - additionalProperties: false 263 - 264 262 additionalProperties: false 265 263 266 264 required:
+3 -3
Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml
··· 97 97 - $ref: /schemas/types.yaml#/definitions/uint32 98 98 - minimum: 0 99 99 maximum: 63 100 - default: 0 100 + default: 32 101 101 102 102 qcom,charge-ctrl-value: 103 103 description: ··· 130 130 - $ref: /schemas/types.yaml#/definitions/uint32 131 131 - minimum: 0 132 132 maximum: 3 133 - default: 2 133 + default: 0 134 134 135 135 qcom,preemphasis-width: 136 136 description: ··· 152 152 - $ref: /schemas/types.yaml#/definitions/uint32 153 153 - minimum: 0 154 154 maximum: 3 155 - default: 0 155 + default: 1 156 156 157 157 required: 158 158 - compatible
-1
Documentation/devicetree/bindings/regulator/mps,mp5416.yaml
··· 37 37 type: object 38 38 39 39 additionalProperties: false 40 - additionalProperties: false 41 40 42 41 required: 43 42 - compatible
+2 -1
Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml
··· 75 75 description: | 76 76 disables over voltage protection of this buck 77 77 78 - additionalProperties: false 78 + unevaluatedProperties: false 79 + 79 80 additionalProperties: false 80 81 81 82 required:
+5 -1
Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml
··· 35 35 description: 36 36 should be "ldo1", ..., "ldo7" 37 37 38 + unevaluatedProperties: false 39 + 38 40 "^BUCK[1-7]$": 39 41 type: object 40 42 allOf: ··· 105 103 106 104 required: 107 105 - regulator-name 108 - additionalProperties: false 106 + 107 + unevaluatedProperties: false 108 + 109 109 additionalProperties: false
+5 -1
Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml
··· 41 41 description: 42 42 should be "ldo1", ..., "ldo7" 43 43 44 + unevaluatedProperties: false 45 + 44 46 "^BUCK[1-8]$": 45 47 type: object 46 48 allOf: ··· 101 99 102 100 required: 103 101 - regulator-name 104 - additionalProperties: false 102 + 103 + unevaluatedProperties: false 104 + 105 105 additionalProperties: false
+5 -1
Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
··· 40 40 description: 41 41 should be "ldo1", ..., "ldo6" 42 42 43 + unevaluatedProperties: false 44 + 43 45 "^BUCK[1-6]$": 44 46 type: object 45 47 allOf: ··· 95 93 96 94 required: 97 95 - regulator-name 98 - additionalProperties: false 96 + 97 + unevaluatedProperties: false 98 + 99 99 additionalProperties: false