Skip to content

Commit 5879288

Browse files
committed
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
2 parents b2768df + 4bc77b2 commit 5879288

File tree

8 files changed

+32
-19
lines changed

8 files changed

+32
-19
lines changed

Documentation/devicetree/bindings/Makefile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
DT_DOC_CHECKER ?= dt-doc-validate
33
DT_EXTRACT_EX ?= dt-extract-example
44
DT_MK_SCHEMA ?= dt-mk-schema
5+
DT_MK_SCHEMA_USERONLY_FLAG := $(if $(DT_SCHEMA_FILES), -u)
56

67
quiet_cmd_chk_binding = CHKDT $(patsubst $(srctree)/%,%,$<)
78
cmd_chk_binding = $(DT_DOC_CHECKER) -u $(srctree)/$(src) $< ; \
@@ -13,16 +14,18 @@ $(obj)/%.example.dts: $(src)/%.yaml FORCE
1314
# Use full schemas when checking %.example.dts
1415
DT_TMP_SCHEMA := $(obj)/processed-schema-examples.yaml
1516

17+
find_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
18+
-name 'processed-schema*' ! \
19+
-name '*.example.dt.yaml' \)
20+
1621
quiet_cmd_mk_schema = SCHEMA $@
17-
cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(real-prereqs)
22+
cmd_mk_schema = rm -f $@ ; \
23+
$(if $(DT_MK_SCHEMA_FLAGS), \
24+
echo $(real-prereqs), \
25+
$(find_cmd)) | \
26+
xargs $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) >> $@
1827

19-
DT_DOCS = $(addprefix $(src)/, \
20-
$(shell \
21-
cd $(srctree)/$(src) && \
22-
find * \( -name '*.yaml' ! \
23-
-name 'processed-schema*' ! \
24-
-name '*.example.dt.yaml' \) \
25-
))
28+
DT_DOCS = $(shell $(find_cmd) | sed -e 's|^$(srctree)/||')
2629

2730
DT_SCHEMA_FILES ?= $(DT_DOCS)
2831

@@ -37,7 +40,7 @@ override DTC_FLAGS := \
3740
$(obj)/processed-schema-examples.yaml: $(DT_DOCS) FORCE
3841
$(call if_changed,mk_schema)
3942

40-
$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := -u
43+
$(obj)/processed-schema.yaml: DT_MK_SCHEMA_FLAGS := $(DT_MK_SCHEMA_USERONLY_FLAG)
4144
$(obj)/processed-schema.yaml: $(DT_SCHEMA_FILES) FORCE
4245
$(call if_changed,mk_schema)
4346

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,6 @@ properties:
259259

260260
additionalProperties: false
261261

262-
additionalProperties: false
263-
264262
additionalProperties: false
265263

266264
required:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ then:
9797
- $ref: /schemas/types.yaml#/definitions/uint32
9898
- minimum: 0
9999
maximum: 63
100-
default: 0
100+
default: 32
101101

102102
qcom,charge-ctrl-value:
103103
description:
@@ -130,7 +130,7 @@ then:
130130
- $ref: /schemas/types.yaml#/definitions/uint32
131131
- minimum: 0
132132
maximum: 3
133-
default: 2
133+
default: 0
134134

135135
qcom,preemphasis-width:
136136
description:
@@ -152,7 +152,7 @@ then:
152152
- $ref: /schemas/types.yaml#/definitions/uint32
153153
- minimum: 0
154154
maximum: 3
155-
default: 0
155+
default: 1
156156

157157
required:
158158
- compatible

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ properties:
3737
type: object
3838

3939
additionalProperties: false
40-
additionalProperties: false
4140

4241
required:
4342
- compatible

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ properties:
7575
description: |
7676
disables over voltage protection of this buck
7777
78-
additionalProperties: false
78+
unevaluatedProperties: false
79+
7980
additionalProperties: false
8081

8182
required:

Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ patternProperties:
3535
description:
3636
should be "ldo1", ..., "ldo7"
3737

38+
unevaluatedProperties: false
39+
3840
"^BUCK[1-7]$":
3941
type: object
4042
allOf:
@@ -103,5 +105,7 @@ patternProperties:
103105

104106
required:
105107
- regulator-name
106-
additionalProperties: false
108+
109+
unevaluatedProperties: false
110+
107111
additionalProperties: false

Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ patternProperties:
4141
description:
4242
should be "ldo1", ..., "ldo7"
4343

44+
unevaluatedProperties: false
45+
4446
"^BUCK[1-8]$":
4547
type: object
4648
allOf:
@@ -99,5 +101,7 @@ patternProperties:
99101

100102
required:
101103
- regulator-name
102-
additionalProperties: false
104+
105+
unevaluatedProperties: false
106+
103107
additionalProperties: false

Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ patternProperties:
4040
description:
4141
should be "ldo1", ..., "ldo6"
4242

43+
unevaluatedProperties: false
44+
4345
"^BUCK[1-6]$":
4446
type: object
4547
allOf:
@@ -93,5 +95,7 @@ patternProperties:
9395

9496
required:
9597
- regulator-name
96-
additionalProperties: false
98+
99+
unevaluatedProperties: false
100+
97101
additionalProperties: false

0 commit comments

Comments
 (0)