aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Vaussard <florian.vaussard@epfl.ch>2013-06-11 10:50:50 -0400
committerBenoit Cousson <benoit.cousson@linaro.org>2013-06-19 05:34:42 -0400
commitac25da7f30a118b7021c5b49c2cc50ba832db962 (patch)
tree9b35f5e29a02fb3c7ffd2eea8a3e7ce6eda58c07
parent75fbbca2b11ce7c8ee728a8c5d0e58b477eccf4f (diff)
ARM: dts: Protect pinctrl headers against multiple inclusions
Pinctrl headers were not protected with #ifndef. Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
-rw-r--r--include/dt-bindings/pinctrl/am33xx.h5
-rw-r--r--include/dt-bindings/pinctrl/omap.h5
2 files changed, 10 insertions, 0 deletions
diff --git a/include/dt-bindings/pinctrl/am33xx.h b/include/dt-bindings/pinctrl/am33xx.h
index a3fddd4f6ecf..469e0325e6f4 100644
--- a/include/dt-bindings/pinctrl/am33xx.h
+++ b/include/dt-bindings/pinctrl/am33xx.h
@@ -2,6 +2,9 @@
2 * This header provides constants specific to AM33XX pinctrl bindings. 2 * This header provides constants specific to AM33XX pinctrl bindings.
3 */ 3 */
4 4
5#ifndef _DT_BINDINGS_PINCTRL_AM33XX_H
6#define _DT_BINDINGS_PINCTRL_AM33XX_H
7
5#include <include/dt-bindings/pinctrl/omap.h> 8#include <include/dt-bindings/pinctrl/omap.h>
6 9
7/* am33xx specific mux bit defines */ 10/* am33xx specific mux bit defines */
@@ -35,3 +38,5 @@
35#undef PIN_OFF_INPUT_PULLDOWN 38#undef PIN_OFF_INPUT_PULLDOWN
36#undef PIN_OFF_WAKEUPENABLE 39#undef PIN_OFF_WAKEUPENABLE
37 40
41#endif
42
diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h
index 370df3f376cb..edbd250809cb 100644
--- a/include/dt-bindings/pinctrl/omap.h
+++ b/include/dt-bindings/pinctrl/omap.h
@@ -5,6 +5,9 @@
5 * Copyright (C) 2009-2010 Texas Instruments 5 * Copyright (C) 2009-2010 Texas Instruments
6 */ 6 */
7 7
8#ifndef _DT_BINDINGS_PINCTRL_OMAP_H
9#define _DT_BINDINGS_PINCTRL_OMAP_H
10
8/* 34xx mux mode options for each pin. See TRM for options */ 11/* 34xx mux mode options for each pin. See TRM for options */
9#define MUX_MODE0 0 12#define MUX_MODE0 0
10#define MUX_MODE1 1 13#define MUX_MODE1 1
@@ -48,3 +51,5 @@
48#define PIN_OFF_INPUT_PULLDOWN (OFF_EN | OFF_PULL_EN) 51#define PIN_OFF_INPUT_PULLDOWN (OFF_EN | OFF_PULL_EN)
49#define PIN_OFF_WAKEUPENABLE WAKEUP_EN 52#define PIN_OFF_WAKEUPENABLE WAKEUP_EN
50 53
54#endif
55