Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310809
b: refs/heads/master
c: 3a86a5f
h: refs/heads/master
i:
  310807: b65d115
v: v3
  • Loading branch information
Devendra Naga authored and Linus Walleij committed Jun 12, 2012
1 parent b493bcf commit 841ab92
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e85bbc19d5a9ad2b48bf8f2fd3277d6fe58f23ce
refs/heads/master: 3a86a5f8abb33956446ae31b1e9c149d7b2d1d21
28 changes: 12 additions & 16 deletions trunk/drivers/pinctrl/pinctrl-imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@
#include "core.h"
#include "pinctrl-imx.h"

#define IMX_PMX_DUMP(info, p, m, c, n) \
{ \
int i, j; \
printk("Format: Pin Mux Config\n"); \
for (i = 0; i < n; i++) { \
j = p[i]; \
printk("%s %d 0x%lx\n", \
info->pins[j].name, \
m[i], c[i]); \
} \
#define IMX_PMX_DUMP(info, p, m, c, n) \
{ \
int i, j; \
printk(KERN_DEBUG "Format: Pin Mux Config\n"); \
for (i = 0; i < n; i++) { \
j = p[i]; \
printk(KERN_DEBUG "%s %d 0x%lx\n", \
info->pins[j].name, \
m[i], c[i]); \
} \
}

/* The bits in CONFIG cell defined in binding doc*/
Expand Down Expand Up @@ -201,10 +201,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev,
static void imx_dt_free_map(struct pinctrl_dev *pctldev,
struct pinctrl_map *map, unsigned num_maps)
{
int i;

for (i = 0; i < num_maps; i++)
kfree(map);
kfree(map);
}

static struct pinctrl_ops imx_pctrl_ops = {
Expand Down Expand Up @@ -475,9 +472,8 @@ static int __devinit imx_pinctrl_parse_groups(struct device_node *np,
grp->configs[j] = config & ~IMX_PAD_SION;
}

#ifdef DEBUG
IMX_PMX_DUMP(info, grp->pins, grp->mux_mode, grp->configs, grp->npins);
#endif

return 0;
}

Expand Down

0 comments on commit 841ab92

Please sign in to comment.