From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Brugger Subject: Re: [PATCH 7/7] ARM: meson: update documentation (uart, timer and vendors) Date: Mon, 18 Aug 2014 12:36:47 +0200 Message-ID: <53F1D73F.8010204@gmail.com> References: <1408272594-10814-1-git-send-email-carlo@caione.org> <1408272594-10814-8-git-send-email-carlo@caione.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1408272594-10814-8-git-send-email-carlo@caione.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Carlo Caione , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-serial@vger.kernel.org, linux@arm.linux.org.uk, robh+dt@kernel.org, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, daniel.lezcano@linaro.org, tglx@linutronix.de, gregkh@linuxfoundation.org, jslaby@suse.cz, grant.likely@linaro.org, b.galvani@gmail.com List-Id: linux-serial@vger.kernel.org On 17/08/14 12:49, Carlo Caione wrote: > New UART and timer bindings are documented. A new vendor is added to the > vendors list. > > Signed-off-by: Carlo Caione > --- > .../devicetree/bindings/serial/amlogic,meson-uart.txt | 17 +++++++++++++++++ > .../devicetree/bindings/timer/amlogic,meson6-timer.txt | 16 ++++++++++++++++ > Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + > 3 files changed, 34 insertions(+) > create mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt > create mode 100644 Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt This should be three patches for the different files. It might happen, that for example your timer driver get merged through a different tree then arm-soc. For the merge, the driver and the documentation should go togehter. > > diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt > new file mode 100644 > index 0000000..fa1935a > --- /dev/null > +++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt > @@ -0,0 +1,17 @@ > +Amlogic Meson UART > + > +Required properties: > +- compatible : Should be "amlogic,meson-uart" > +- reg : Address and length of the register set > +- interrupts : Should contain uart interrupt > +- clocks: phandle to the source clock > + > +Example: > + > +uart0: serial@c81004c0 { > + compatible = "amlogic,meson-uart"; > + reg = <0xc81004c0 0x14>; > + interrupts = <0 90 1>; > + clocks = <&clk81>; > +}; > + > diff --git a/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt > new file mode 100644 > index 0000000..cf89894 > --- /dev/null > +++ b/Documentation/devicetree/bindings/timer/amlogic,meson6-timer.txt > @@ -0,0 +1,16 @@ > +Amlogic Meson6 SoCs Timer Controller > + > +Required properties: > + > +- compatible : should be "amlogic,meson6-timer.txt" > +- reg : Specifies base physical address and size of the registers. > +- interrupts : The interrupt of the first timer > + > +Example: > + > +timer@c1109940 { > + compatible = "amlogic,meson6-timer"; > + reg = <0xc1109940 0x14>; > + interrupts = <0 10 1>; > +}; > + > diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt > index ac7269f..5cf0618 100644 > --- a/Documentation/devicetree/bindings/vendor-prefixes.txt > +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt > @@ -14,6 +14,7 @@ allwinner Allwinner Technology Co., Ltd. > altr Altera Corp. > amcc Applied Micro Circuits Corporation (APM, formally AMCC) > amd Advanced Micro Devices (AMD), Inc. > +amlogic Amlogic, Inc. > ams AMS AG > amstaos AMS-Taos Inc. > apm Applied Micro Circuits Corporation (APM) >