Skip to content

Commit

Permalink
Merge branch 'yaml-bindings-for-v4.21' into dt/next
Browse files Browse the repository at this point in the history
  • Loading branch information
robherring committed Dec 13, 2018
2 parents cd1cc0b + 2c9b0b0 commit acc2038
Show file tree
Hide file tree
Showing 386 changed files with 5,990 additions and 3,056 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*.bin
*.bz2
*.c.[012]*.*
*.dt.yaml
*.dtb
*.dtb.S
*.dwo
Expand Down
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ Peter Oruba <[email protected]>
Peter Oruba <[email protected]>
Pratyush Anand <[email protected]> <[email protected]>
Praveen BP <[email protected]>
Punit Agrawal <[email protected]> <[email protected]>
Qais Yousef <[email protected]> <[email protected]>
Oleksij Rempel <[email protected]> <[email protected]>
Oleksij Rempel <[email protected]> <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions Documentation/ABI/testing/sysfs-class-led-trigger-pattern
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ Description:
0-| / \/ \/
+---0----1----2----3----4----5----6------------> time (s)

2. To make the LED go instantly from one brigntess value to another,
we should use use zero-time lengths (the brightness must be same as
2. To make the LED go instantly from one brightness value to another,
we should use zero-time lengths (the brightness must be same as
the previous tuple's). So the format should be:
"brightness_1 duration_1 brightness_1 0 brightness_2 duration_2
brightness_2 0 ...". For example:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Makefile for Sphinx documentation
#

subdir-y :=
subdir-y := devicetree/bindings/

# You can set these variables from the command line.
SPHINXBUILD = sphinx-build
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.example.dts
processed-schema.yaml
27 changes: 27 additions & 0 deletions Documentation/devicetree/bindings/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# SPDX-License-Identifier: GPL-2.0
DT_DOC_CHECKER ?= dt-doc-validate
DT_EXTRACT_EX ?= dt-extract-example
DT_MK_SCHEMA ?= dt-mk-schema
DT_MK_SCHEMA_FLAGS := $(if $(DT_SCHEMA_FILES), -u)

quiet_cmd_chk_binding = CHKDT $(patsubst $(srctree)/%,%,$<)
cmd_chk_binding = $(DT_DOC_CHECKER) $< ; \
$(DT_EXTRACT_EX) $< > $@

$(obj)/%.example.dts: $(src)/%.yaml FORCE
$(call if_changed,chk_binding)

DT_TMP_SCHEMA := processed-schema.yaml
extra-y += $(DT_TMP_SCHEMA)

quiet_cmd_mk_schema = SCHEMA $@
cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(filter-out FORCE, $^)

DT_DOCS = $(shell cd $(srctree)/$(src) && find * -name '*.yaml')
DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))

extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
extra-y += $(patsubst $(src)/%.yaml,%.example.dtb, $(DT_SCHEMA_FILES))

$(obj)/$(DT_TMP_SCHEMA): $(DT_SCHEMA_FILES) FORCE
$(call if_changed,mk_schema)
14 changes: 0 additions & 14 deletions Documentation/devicetree/bindings/arm/altera.txt

This file was deleted.

20 changes: 20 additions & 0 deletions Documentation/devicetree/bindings/arm/altera.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# SPDX-License-Identifier: GPL-2.0
%YAML 1.2
---
$id: http://devicetree.org/schemas/arm/altera.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Altera's SoCFPGA platform device tree bindings

maintainers:
- Dinh Nguyen <[email protected]>

properties:
compatible:
items:
- enum:
- altr,socfpga-cyclone5
- altr,socfpga-arria5
- altr,socfpga-arria10
- const: altr,socfpga
...

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# SPDX-License-Identifier: GPL-2.0
%YAML 1.2
---
$id: http://devicetree.org/schemas/arm/altera/socfpga-clk-manager.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Altera SOCFPGA Clock Manager

maintainers:
- Dinh Nguyen <[email protected]>

description: test

properties:
compatible:
items:
- const: altr,clk-mgr
reg:
maxItems: 1

required:
- compatible

examples:
- |
clkmgr@ffd04000 {
compatible = "altr,clk-mgr";
reg = <0xffd04000 0x1000>;
};
...
15 changes: 0 additions & 15 deletions Documentation/devicetree/bindings/arm/calxeda.txt

This file was deleted.

22 changes: 22 additions & 0 deletions Documentation/devicetree/bindings/arm/calxeda.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/arm/calxeda.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Calxeda Platforms Device Tree Bindings

maintainers:
- Rob Herring <[email protected]>
description: |+
Bindings for boards with Calxeda Cortex-A9 based ECX-1000 (Highbank) SOC
or Cortex-A15 based ECX-2000 SOCs
properties:
$nodename:
const: '/'
compatible:
items:
- enum:
- calxeda,highbank
- calxeda,ecx-2000
Loading

0 comments on commit acc2038

Please sign in to comment.