From 4e2b3070d81de54c79c67e276e4293a8a1148b4a Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 11 Feb 2019 10:48:06 +0100 Subject: dts: update to v5.0-rc5 Signed-off-by: Sascha Hauer --- dts/Bindings/Makefile | 6 +++++- dts/Bindings/serio/olpc,ap-sp.txt | 4 ---- dts/include/dt-bindings/clock/marvell,mmp2.h | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'dts') diff --git a/dts/Bindings/Makefile b/dts/Bindings/Makefile index 6e5cef0ed6..50daa0b3b0 100644 --- a/dts/Bindings/Makefile +++ b/dts/Bindings/Makefile @@ -17,7 +17,11 @@ 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_DOCS = $(shell \ + cd $(srctree)/$(src) && \ + find * \( -name '*.yaml' ! -name $(DT_TMP_SCHEMA) \) \ + ) + DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS)) extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES)) diff --git a/dts/Bindings/serio/olpc,ap-sp.txt b/dts/Bindings/serio/olpc,ap-sp.txt index 36603419d6..0e72183f52 100644 --- a/dts/Bindings/serio/olpc,ap-sp.txt +++ b/dts/Bindings/serio/olpc,ap-sp.txt @@ -4,14 +4,10 @@ Required properties: - compatible : "olpc,ap-sp" - reg : base address and length of SoC's WTM registers - interrupts : SP-AP interrupt -- clocks : phandle + clock-specifier for the clock that drives the WTM -- clock-names: should be "sp" Example: ap-sp@d4290000 { compatible = "olpc,ap-sp"; reg = <0xd4290000 0x1000>; interrupts = <40>; - clocks = <&soc_clocks MMP2_CLK_SP>; - clock-names = "sp"; } diff --git a/dts/include/dt-bindings/clock/marvell,mmp2.h b/dts/include/dt-bindings/clock/marvell,mmp2.h index 7b24fc7911..228a5e234a 100644 --- a/dts/include/dt-bindings/clock/marvell,mmp2.h +++ b/dts/include/dt-bindings/clock/marvell,mmp2.h @@ -71,7 +71,6 @@ #define MMP2_CLK_CCIC1_MIX 117 #define MMP2_CLK_CCIC1_PHY 118 #define MMP2_CLK_CCIC1_SPHY 119 -#define MMP2_CLK_SP 120 #define MMP2_NR_CLKS 200 #endif -- cgit v1.2.3