From: Grant Likely <grant.likely@secretlab.ca>
To: Florian Vaussard <florian.vaussard@epfl.ch>,
Benoit Cousson <b-cousson@ti.com>
Cc: devicetree-discuss@lists.ozlabs.org, linux-omap@vger.kernel.org
Subject: Re: [PATCH] ARM: dts: Protect pinctrl headers against multiple inclusions
Date: Tue, 11 Jun 2013 22:57:56 +0100 [thread overview]
Message-ID: <20130611215756.9B0CA3E0D8D@localhost> (raw)
In-Reply-To: <1370962250-9745-1-git-send-email-florian.vaussard@epfl.ch>
On Tue, 11 Jun 2013 16:50:50 +0200, Florian Vaussard <florian.vaussard@epfl.ch> wrote:
> Pinctrl headers were not protected with #ifndef.
>
> Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Obviously this needs to go in via whatever tree added the modified
header files.
Acked-by: Grant Likely <grant.likely@secretlab.ca>
> ---
> include/dt-bindings/pinctrl/am33xx.h | 5 +++++
> include/dt-bindings/pinctrl/omap.h | 5 +++++
> 2 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/include/dt-bindings/pinctrl/am33xx.h b/include/dt-bindings/pinctrl/am33xx.h
> index a3fddd4..469e032 100644
> --- a/include/dt-bindings/pinctrl/am33xx.h
> +++ b/include/dt-bindings/pinctrl/am33xx.h
> @@ -2,6 +2,9 @@
> * This header provides constants specific to AM33XX pinctrl bindings.
> */
>
> +#ifndef _DT_BINDINGS_PINCTRL_AM33XX_H
> +#define _DT_BINDINGS_PINCTRL_AM33XX_H
> +
> #include <include/dt-bindings/pinctrl/omap.h>
>
> /* am33xx specific mux bit defines */
> @@ -35,3 +38,5 @@
> #undef PIN_OFF_INPUT_PULLDOWN
> #undef PIN_OFF_WAKEUPENABLE
>
> +#endif
> +
> diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h
> index 370df3f..edbd250 100644
> --- a/include/dt-bindings/pinctrl/omap.h
> +++ b/include/dt-bindings/pinctrl/omap.h
> @@ -5,6 +5,9 @@
> * Copyright (C) 2009-2010 Texas Instruments
> */
>
> +#ifndef _DT_BINDINGS_PINCTRL_OMAP_H
> +#define _DT_BINDINGS_PINCTRL_OMAP_H
> +
> /* 34xx mux mode options for each pin. See TRM for options */
> #define MUX_MODE0 0
> #define MUX_MODE1 1
> @@ -48,3 +51,5 @@
> #define PIN_OFF_INPUT_PULLDOWN (OFF_EN | OFF_PULL_EN)
> #define PIN_OFF_WAKEUPENABLE WAKEUP_EN
>
> +#endif
> +
> --
> 1.7.5.4
>
> _______________________________________________
> devicetree-discuss mailing list
> devicetree-discuss@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/devicetree-discuss
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
next prev parent reply other threads:[~2013-06-11 21:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-11 14:50 [PATCH] ARM: dts: Protect pinctrl headers against multiple inclusions Florian Vaussard
2013-06-11 21:57 ` Grant Likely [this message]
2013-06-12 6:42 ` Florian Vaussard
2013-06-12 16:18 ` Cousson, Benoit
2013-06-19 9:28 ` Florian Vaussard
2013-06-19 9:33 ` Benoit Cousson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130611215756.9B0CA3E0D8D@localhost \
--to=grant.likely@secretlab.ca \
--cc=b-cousson@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=florian.vaussard@epfl.ch \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).