If CONFIG_OMAP_MUX_DEBUG and CONFIG_OMAP_MUX_WARNING are not set,
the debug member is not declared in pin_config struct and should
not be used on MUX_CFG and MUX_CFG_730 macro.
Signed-off-by: David Cohen <david.cohen@xxxxxxxxxxx>
---
include/asm-arm/arch-omap/mux.h | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index 0fb5631..d73c09c 100644
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -85,6 +85,7 @@
#endif /* CONFIG_OMAP_MUX_DEBUG */
+#if defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)
#define MUX_CFG(desc, mux_reg, mode_offset, mode, \
pull_reg, pull_bit, pull_status, \
pu_pd_reg, pu_pd_status, debug_status) \
@@ -95,6 +96,17 @@
PULL_REG(pull_reg, pull_bit, pull_status) \
PU_PD_REG(pu_pd_reg, pu_pd_status) \
},
+#else
+#define MUX_CFG(desc, mux_reg, mode_offset, mode, \
+ pull_reg, pull_bit, pull_status, \
+ pu_pd_reg, pu_pd_status, debug_status) \
+{ \
+ .name = desc, \
+ MUX_REG(mux_reg, mode_offset, mode) \
+ PULL_REG(pull_reg, pull_bit, pull_status) \
+ PU_PD_REG(pu_pd_reg, pu_pd_status) \
+},
+#endif
/*
@@ -104,6 +116,7 @@
* - for pull-up/down, only has one enable bit which is is in the same register
* as mux config
*/
+#if defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)
#define MUX_CFG_730(desc, mux_reg, mode_offset, mode, \
pull_bit, pull_status, debug_status)\
{ \
@@ -113,6 +126,16 @@
PULL_REG_730(mux_reg, pull_bit, pull_status) \
PU_PD_REG(NA, 0) \
},
+#else
+#define MUX_CFG_730(desc, mux_reg, mode_offset, mode, \
+ pull_bit, pull_status, debug_status)\
+{ \
+ .name = desc, \
+ MUX_REG_730(mux_reg, mode_offset, mode) \
+ PULL_REG_730(mux_reg, pull_bit, pull_status) \
+ PU_PD_REG(NA, 0) \
+},
+#endif
#if defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)
#define MUX_CFG_24XX(desc, reg_offset, mode, \
--
1.5.4
-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
