Commit 04063666 authored by Rob Herring's avatar Rob Herring

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

parents 7456427a 4bc77b2d
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
DT_DOC_CHECKER ?= dt-doc-validate DT_DOC_CHECKER ?= dt-doc-validate
DT_EXTRACT_EX ?= dt-extract-example DT_EXTRACT_EX ?= dt-extract-example
DT_MK_SCHEMA ?= dt-mk-schema DT_MK_SCHEMA ?= dt-mk-schema
DT_MK_SCHEMA_USERONLY_FLAG := $(if $(DT_SCHEMA_FILES), -u)
quiet_cmd_chk_binding = CHKDT $(patsubst $(srctree)/%,%,$<) quiet_cmd_chk_binding = CHKDT $(patsubst $(srctree)/%,%,$<)
cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \ cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \
...@@ -13,16 +14,18 @@ $(obj)/%.example.dts: $(src)/%.yaml FORCE ...@@ -13,16 +14,18 @@ $(obj)/%.example.dts: $(src)/%.yaml FORCE
# Use full schemas when checking %.example.dts # Use full schemas when checking %.example.dts
DT_TMP_SCHEMA := $(obj)/processed-schema-examples.yaml 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 $@ 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)/, \ DT_DOCS = $(shell $(find_cmd) | sed -e 's|^$(srctree)/||')
$(shell \
cd $(srctree)/$(src) && \
find * \( -name '*.yaml' ! \
-name 'processed-schema*' ! \
-name '*.example.dt.yaml' \) \
))
DT_SCHEMA_FILES ?= $(DT_DOCS) DT_SCHEMA_FILES ?= $(DT_DOCS)
...@@ -37,7 +40,7 @@ override DTC_FLAGS := \ ...@@ -37,7 +40,7 @@ override DTC_FLAGS := \
$(obj)/processed-schema-examples.yaml: $(DT_DOCS) FORCE $(obj)/processed-schema-examples.yaml: $(DT_DOCS) FORCE
$(call if_changed,mk_schema) $(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 $(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) FORCE
$(call if_changed,mk_schema) $(call if_changed,mk_schema)
......
...@@ -259,8 +259,6 @@ properties: ...@@ -259,8 +259,6 @@ properties:
additionalProperties: false additionalProperties: false
additionalProperties: false
additionalProperties: false additionalProperties: false
required: required:
......
...@@ -97,7 +97,7 @@ then: ...@@ -97,7 +97,7 @@ then:
- $ref: /schemas/types.yaml#/definitions/uint32 - $ref: /schemas/types.yaml#/definitions/uint32
- minimum: 0 - minimum: 0
maximum: 63 maximum: 63
default: 0 default: 32
qcom,charge-ctrl-value: qcom,charge-ctrl-value:
description: description:
...@@ -130,7 +130,7 @@ then: ...@@ -130,7 +130,7 @@ then:
- $ref: /schemas/types.yaml#/definitions/uint32 - $ref: /schemas/types.yaml#/definitions/uint32
- minimum: 0 - minimum: 0
maximum: 3 maximum: 3
default: 2 default: 0
qcom,preemphasis-width: qcom,preemphasis-width:
description: description:
...@@ -152,7 +152,7 @@ then: ...@@ -152,7 +152,7 @@ then:
- $ref: /schemas/types.yaml#/definitions/uint32 - $ref: /schemas/types.yaml#/definitions/uint32
- minimum: 0 - minimum: 0
maximum: 3 maximum: 3
default: 0 default: 1
required: required:
- compatible - compatible
......
...@@ -37,7 +37,6 @@ properties: ...@@ -37,7 +37,6 @@ properties:
type: object type: object
additionalProperties: false additionalProperties: false
additionalProperties: false
required: required:
- compatible - compatible
......
...@@ -75,7 +75,8 @@ properties: ...@@ -75,7 +75,8 @@ properties:
description: | description: |
disables over voltage protection of this buck disables over voltage protection of this buck
additionalProperties: false unevaluatedProperties: false
additionalProperties: false additionalProperties: false
required: required:
......
...@@ -35,6 +35,8 @@ patternProperties: ...@@ -35,6 +35,8 @@ patternProperties:
description: description:
should be "ldo1", ..., "ldo7" should be "ldo1", ..., "ldo7"
unevaluatedProperties: false
"^BUCK[1-7]$": "^BUCK[1-7]$":
type: object type: object
allOf: allOf:
...@@ -103,5 +105,7 @@ patternProperties: ...@@ -103,5 +105,7 @@ patternProperties:
required: required:
- regulator-name - regulator-name
additionalProperties: false
unevaluatedProperties: false
additionalProperties: false additionalProperties: false
...@@ -41,6 +41,8 @@ patternProperties: ...@@ -41,6 +41,8 @@ patternProperties:
description: description:
should be "ldo1", ..., "ldo7" should be "ldo1", ..., "ldo7"
unevaluatedProperties: false
"^BUCK[1-8]$": "^BUCK[1-8]$":
type: object type: object
allOf: allOf:
...@@ -99,5 +101,7 @@ patternProperties: ...@@ -99,5 +101,7 @@ patternProperties:
required: required:
- regulator-name - regulator-name
additionalProperties: false
unevaluatedProperties: false
additionalProperties: false additionalProperties: false
...@@ -40,6 +40,8 @@ patternProperties: ...@@ -40,6 +40,8 @@ patternProperties:
description: description:
should be "ldo1", ..., "ldo6" should be "ldo1", ..., "ldo6"
unevaluatedProperties: false
"^BUCK[1-6]$": "^BUCK[1-6]$":
type: object type: object
allOf: allOf:
...@@ -93,5 +95,7 @@ patternProperties: ...@@ -93,5 +95,7 @@ patternProperties:
required: required:
- regulator-name - regulator-name
additionalProperties: false
unevaluatedProperties: false
additionalProperties: false additionalProperties: false
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment