From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Vaussard Subject: [PATCH v2] Documentation: dt: Reduce fragmentation of <..> placeholders Date: Sat, 8 Mar 2014 00:28:30 +0100 Message-ID: <1394234910-8547-1-git-send-email-florian.vaussard@epfl.ch> References: Return-path: In-Reply-To: Sender: linux-doc-owner@vger.kernel.org To: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Rob Landley Cc: Geert Uytterhoeven , Joe Perches , devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org Placeholders <..> are sometimes used in the devicetree documentation to define family-wide compatible strings (like fsl,-ipu where chip can be any Freescale SoC). These placeholders are loosly defined. This lead to some fragmentation. Looking at the current placeholders, we have: 3 32 1 1 1 30 1 1 This patch consolidates this to: 3 33 1 1 32 Reported-by: Joe Perches Signed-off-by: Florian Vaussard --- Documentation/devicetree/bindings/arm/samsung/sysreg.txt | 2 +- Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt | 2 +- Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/samsung/sysreg.txt b/Documentation/devicetree/bindings/arm/samsung/sysreg.txt index 0ab3251..b945b23 100644 --- a/Documentation/devicetree/bindings/arm/samsung/sysreg.txt +++ b/Documentation/devicetree/bindings/arm/samsung/sysreg.txt @@ -1,7 +1,7 @@ SAMSUNG S5P/Exynos SoC series System Registers (SYSREG) Properties: - - compatible : should contain "samsung,-sysreg", "syscon"; + - compatible : should contain "samsung,-sysreg", "syscon"; For Exynos4 SoC series it should be "samsung,exynos4-sysreg", "syscon"; - reg : offset and length of the register set. diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt index 05bf82a..393a53a 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-st.txt @@ -12,7 +12,7 @@ ST pinctrl driver controls PIO multiplexing block and also interacts with gpio driver to configure a pin. Required properties: (PIO multiplexing block) -- compatible : should be "st,--pinctrl" +- compatible : should be "st,--pinctrl" like st,stih415-sbc-pinctrl, st,stih415-front-pinctrl and so on. - gpio-controller : Indicates this device is a GPIO controller - #gpio-cells : Should be one. The first cell is the pin number. diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt index e39cb26..b488ffa 100644 --- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt @@ -2,8 +2,8 @@ Allwinner SoCs Watchdog timer Required properties: -- compatible : should be "allwinner,-wdt", the currently supported - SoC families being sun4i and sun6i +- compatible : should be "allwinner,-wdt", the currently supported + SoC being sun4i and sun6i - reg : Specifies base physical address and size of the registers. Example: -- 1.8.5.3