* [PATCH] ARM: dts: Protect pinctrl headers against multiple inclusions
@ 2013-06-11 14:50 Florian Vaussard
2013-06-11 21:57 ` Grant Likely
0 siblings, 1 reply; 6+ messages in thread
From: Florian Vaussard @ 2013-06-11 14:50 UTC (permalink / raw)
To: Benoit Cousson
Cc: Tony Lindgren, linux-omap, devicetree-discuss, Florian Vaussard
Pinctrl headers were not protected with #ifndef.
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: Protect pinctrl headers against multiple inclusions
2013-06-11 14:50 [PATCH] ARM: dts: Protect pinctrl headers against multiple inclusions Florian Vaussard
@ 2013-06-11 21:57 ` Grant Likely
2013-06-12 6:42 ` Florian Vaussard
0 siblings, 1 reply; 6+ messages in thread
From: Grant Likely @ 2013-06-11 21:57 UTC (permalink / raw)
To: Florian Vaussard, Benoit Cousson; +Cc: devicetree-discuss, linux-omap
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: Protect pinctrl headers against multiple inclusions
2013-06-11 21:57 ` Grant Likely
@ 2013-06-12 6:42 ` Florian Vaussard
2013-06-12 16:18 ` Cousson, Benoit
0 siblings, 1 reply; 6+ messages in thread
From: Florian Vaussard @ 2013-06-12 6:42 UTC (permalink / raw)
To: Grant Likely; +Cc: Benoit Cousson, devicetree-discuss, linux-omap
Hello Grant,
On 06/11/2013 11:57 PM, Grant Likely wrote:
> 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.
>
I authored these files, sorry for this stupid omission. Benoit, can you
take this patch?
Regards,
Florian
> 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
>
--
Florian Vaussard
EPFL - STI - IMT - LSRO1
MEB330 - Station 9
1015 Lausanne / Switzerland
tel: +41 21 693 78 39
fax: +41 21 693 78 07
http://lsro.epfl.ch
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: Protect pinctrl headers against multiple inclusions
2013-06-12 6:42 ` Florian Vaussard
@ 2013-06-12 16:18 ` Cousson, Benoit
2013-06-19 9:28 ` Florian Vaussard
0 siblings, 1 reply; 6+ messages in thread
From: Cousson, Benoit @ 2013-06-12 16:18 UTC (permalink / raw)
To: florian.vaussard; +Cc: Grant Likely, devicetree-discuss, linux-omap
Hi Florian,
On 6/12/2013 8:42 AM, Florian Vaussard wrote:
> Hello Grant,
>
> On 06/11/2013 11:57 PM, Grant Likely wrote:
>> 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.
>>
>
> I authored these files, sorry for this stupid omission. Benoit, can you
> take this patch?
Yes, sure, I'll take it with Grant's ack.
Benoit
>
> Regards,
>
> Florian
>
>> 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
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: Protect pinctrl headers against multiple inclusions
2013-06-12 16:18 ` Cousson, Benoit
@ 2013-06-19 9:28 ` Florian Vaussard
2013-06-19 9:33 ` Benoit Cousson
0 siblings, 1 reply; 6+ messages in thread
From: Florian Vaussard @ 2013-06-19 9:28 UTC (permalink / raw)
To: Cousson, Benoit; +Cc: Grant Likely, devicetree-discuss, linux-omap
Hello Benoit,
On 06/12/2013 06:18 PM, Cousson, Benoit wrote:
> Hi Florian,
>
> On 6/12/2013 8:42 AM, Florian Vaussard wrote:
>> Hello Grant,
>>
>> On 06/11/2013 11:57 PM, Grant Likely wrote:
>>> 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.
>>>
>>
>> I authored these files, sorry for this stupid omission. Benoit, can you
>> take this patch?
>
> Yes, sure, I'll take it with Grant's ack.
>
I think that you missed this one.
Regards,
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: Protect pinctrl headers against multiple inclusions
2013-06-19 9:28 ` Florian Vaussard
@ 2013-06-19 9:33 ` Benoit Cousson
0 siblings, 0 replies; 6+ messages in thread
From: Benoit Cousson @ 2013-06-19 9:33 UTC (permalink / raw)
To: florian.vaussard; +Cc: Grant Likely, devicetree-discuss, linux-omap
Hi Florian,
On 06/19/2013 04:28 AM, Florian Vaussard wrote:
> Hello Benoit,
>
> On 06/12/2013 06:18 PM, Cousson, Benoit wrote:
>> Hi Florian,
>>
>> On 6/12/2013 8:42 AM, Florian Vaussard wrote:
>>> Hello Grant,
>>>
>>> On 06/11/2013 11:57 PM, Grant Likely wrote:
>>>> 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.
>>>>
>>>
>>> I authored these files, sorry for this stupid omission. Benoit, can you
>>> take this patch?
>>
>> Yes, sure, I'll take it with Grant's ack.
>>
>
> I think that you missed this one.
In was in the pipe but not pushed yet. That will be done soon.
Thanks,
Benoit
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-06-19 9:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-11 14:50 [PATCH] ARM: dts: Protect pinctrl headers against multiple inclusions Florian Vaussard
2013-06-11 21:57 ` Grant Likely
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
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).