Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
04063666
Commit
04063666
authored
Apr 30, 2020
by
Rob Herring
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dt/linus' into 'dt/next'
parents
7456427a
4bc77b2d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
32 additions
and
19 deletions
+32
-19
Documentation/devicetree/bindings/Makefile
Documentation/devicetree/bindings/Makefile
+12
-9
Documentation/devicetree/bindings/mfd/st,stpmic1.yaml
Documentation/devicetree/bindings/mfd/st,stpmic1.yaml
+0
-2
Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml
Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml
+3
-3
Documentation/devicetree/bindings/regulator/mps,mp5416.yaml
Documentation/devicetree/bindings/regulator/mps,mp5416.yaml
+0
-1
Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml
Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml
+2
-1
Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml
...devicetree/bindings/regulator/rohm,bd71828-regulator.yaml
+5
-1
Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml
...devicetree/bindings/regulator/rohm,bd71837-regulator.yaml
+5
-1
Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
...devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
+5
-1
No files found.
Documentation/devicetree/bindings/Makefile
View file @
04063666
...
...
@@ -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
View file @
04063666
...
...
@@ -259,8 +259,6 @@ properties:
additionalProperties
:
false
additionalProperties
:
false
additionalProperties
:
false
required
:
...
...
Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml
View file @
04063666
...
...
@@ -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
View file @
04063666
...
...
@@ -37,7 +37,6 @@ properties:
type
:
object
additionalProperties
:
false
additionalProperties
:
false
required
:
-
compatible
...
...
Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml
View file @
04063666
...
...
@@ -75,7 +75,8 @@ properties:
description
:
|
disables over voltage protection of this buck
additionalProperties
:
false
unevaluatedProperties
:
false
additionalProperties
:
false
required
:
...
...
Documentation/devicetree/bindings/regulator/rohm,bd71828-regulator.yaml
View file @
04063666
...
...
@@ -35,6 +35,8 @@ patternProperties:
description
:
should be "ldo1", ..., "ldo7"
unevaluatedProperties
:
false
"
^BUCK[1-7]$"
:
type
:
object
allOf
:
...
...
@@ -103,5 +105,7 @@ patternProperties:
required
:
-
regulator-name
additionalProperties
:
false
unevaluatedProperties
:
false
additionalProperties
:
false
Documentation/devicetree/bindings/regulator/rohm,bd71837-regulator.yaml
View file @
04063666
...
...
@@ -41,6 +41,8 @@ patternProperties:
description
:
should be "ldo1", ..., "ldo7"
unevaluatedProperties
:
false
"
^BUCK[1-8]$"
:
type
:
object
allOf
:
...
...
@@ -99,5 +101,7 @@ patternProperties:
required
:
-
regulator-name
additionalProperties
:
false
unevaluatedProperties
:
false
additionalProperties
:
false
Documentation/devicetree/bindings/regulator/rohm,bd71847-regulator.yaml
View file @
04063666
...
...
@@ -40,6 +40,8 @@ patternProperties:
description
:
should be "ldo1", ..., "ldo6"
unevaluatedProperties
:
false
"
^BUCK[1-6]$"
:
type
:
object
allOf
:
...
...
@@ -93,5 +95,7 @@ patternProperties:
required
:
-
regulator-name
additionalProperties
:
false
unevaluatedProperties
:
false
additionalProperties
:
false
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment