aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/pinctrl-imx.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-08-23 04:38:57 -0400
committerLinus Walleij <linus.walleij@linaro.org>2013-08-23 14:52:46 -0400
commit406044695fb286110324491f26f3e05048488809 (patch)
tree149190f005f2e458a3e25e4f38eefa370e55b611 /drivers/pinctrl/pinctrl-imx.c
parent1cb95395870d68f9ff679db42fa15ea03201fc08 (diff)
pinctrl: imx: Fix compilation with DEBUG enabled
This became broken with converting the pinmux arrays into struct types. While at it replace the preprocessor magic with a simple dev_dbg. Reported-by: Tushar Behera <tushar.behera@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-imx.c')
-rw-r--r--drivers/pinctrl/pinctrl-imx.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c
index 3a1424518bcb..360249301315 100644
--- a/drivers/pinctrl/pinctrl-imx.c
+++ b/drivers/pinctrl/pinctrl-imx.c
@@ -27,18 +27,6 @@
27#include "core.h" 27#include "core.h"
28#include "pinctrl-imx.h" 28#include "pinctrl-imx.h"
29 29
30#define IMX_PMX_DUMP(info, p, m, c, n) \
31{ \
32 int i, j; \
33 printk(KERN_DEBUG "Format: Pin Mux Config\n"); \
34 for (i = 0; i < n; i++) { \
35 j = p[i]; \
36 printk(KERN_DEBUG "%s %d 0x%lx\n", \
37 info->pins[j].name, \
38 m[i], c[i]); \
39 } \
40}
41
42/* The bits in CONFIG cell defined in binding doc*/ 30/* The bits in CONFIG cell defined in binding doc*/
43#define IMX_NO_PAD_CTL 0x80000000 /* no pin config need */ 31#define IMX_NO_PAD_CTL 0x80000000 /* no pin config need */
44#define IMX_PAD_SION 0x40000000 /* set SION */ 32#define IMX_PAD_SION 0x40000000 /* set SION */
@@ -498,11 +486,10 @@ static int imx_pinctrl_parse_groups(struct device_node *np,
498 if (config & IMX_PAD_SION) 486 if (config & IMX_PAD_SION)
499 pin->mux_mode |= IOMUXC_CONFIG_SION; 487 pin->mux_mode |= IOMUXC_CONFIG_SION;
500 pin->config = config & ~IMX_PAD_SION; 488 pin->config = config & ~IMX_PAD_SION;
501 }
502 489
503#ifdef DEBUG 490 dev_dbg(info->dev, "%s: %d 0x%08lx", info->pins[i].name,
504 IMX_PMX_DUMP(info, grp->pins, grp->mux_mode, grp->configs, grp->npins); 491 pin->mux_mode, pin->config);
505#endif 492 }
506 493
507 return 0; 494 return 0;
508} 495}