diff options
| -rw-r--r-- | drivers/pinctrl/pinctrl-imx.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/pinctrl-imx.c index f6e7c670906c..09f3a3083540 100644 --- a/drivers/pinctrl/pinctrl-imx.c +++ b/drivers/pinctrl/pinctrl-imx.c | |||
| @@ -27,16 +27,16 @@ | |||
| 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) \ | 30 | #define IMX_PMX_DUMP(info, p, m, c, n) \ |
| 31 | { \ | 31 | { \ |
| 32 | int i, j; \ | 32 | int i, j; \ |
| 33 | printk("Format: Pin Mux Config\n"); \ | 33 | printk(KERN_DEBUG "Format: Pin Mux Config\n"); \ |
| 34 | for (i = 0; i < n; i++) { \ | 34 | for (i = 0; i < n; i++) { \ |
| 35 | j = p[i]; \ | 35 | j = p[i]; \ |
| 36 | printk("%s %d 0x%lx\n", \ | 36 | printk(KERN_DEBUG "%s %d 0x%lx\n", \ |
| 37 | info->pins[j].name, \ | 37 | info->pins[j].name, \ |
| 38 | m[i], c[i]); \ | 38 | m[i], c[i]); \ |
| 39 | } \ | 39 | } \ |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | /* The bits in CONFIG cell defined in binding doc*/ | 42 | /* The bits in CONFIG cell defined in binding doc*/ |
| @@ -201,10 +201,7 @@ static int imx_dt_node_to_map(struct pinctrl_dev *pctldev, | |||
| 201 | static void imx_dt_free_map(struct pinctrl_dev *pctldev, | 201 | static void imx_dt_free_map(struct pinctrl_dev *pctldev, |
| 202 | struct pinctrl_map *map, unsigned num_maps) | 202 | struct pinctrl_map *map, unsigned num_maps) |
| 203 | { | 203 | { |
| 204 | int i; | 204 | kfree(map); |
| 205 | |||
| 206 | for (i = 0; i < num_maps; i++) | ||
| 207 | kfree(map); | ||
| 208 | } | 205 | } |
| 209 | 206 | ||
| 210 | static struct pinctrl_ops imx_pctrl_ops = { | 207 | static struct pinctrl_ops imx_pctrl_ops = { |
| @@ -475,9 +472,8 @@ static int __devinit imx_pinctrl_parse_groups(struct device_node *np, | |||
| 475 | grp->configs[j] = config & ~IMX_PAD_SION; | 472 | grp->configs[j] = config & ~IMX_PAD_SION; |
| 476 | } | 473 | } |
| 477 | 474 | ||
| 478 | #ifdef DEBUG | ||
| 479 | IMX_PMX_DUMP(info, grp->pins, grp->mux_mode, grp->configs, grp->npins); | 475 | IMX_PMX_DUMP(info, grp->pins, grp->mux_mode, grp->configs, grp->npins); |
| 480 | #endif | 476 | |
| 481 | return 0; | 477 | return 0; |
| 482 | } | 478 | } |
| 483 | 479 | ||
