diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-08-12 11:20:23 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-08-12 11:20:23 +0200 |
| commit | c4894905dd155afc32fe87a4701a4bf6099953a7 (patch) | |
| tree | a37889ff1b5a01a8f37d183c053ba16c1707fa15 /drivers/pinctrl/freescale | |
| parent | dc92514c086119369c8c07b5b17c5312e0711d75 (diff) | |
| parent | 352cb8677f83a6cf2139151578c8c79785d2d4bf (diff) | |
Merge tag 'v4.1.5' into toradex_vf_4.1-next
This is the 4.1.5 stable release
Diffstat (limited to 'drivers/pinctrl/freescale')
| -rw-r--r-- | drivers/pinctrl/freescale/pinctrl-imx1-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pinctrl/freescale/pinctrl-imx1-core.c b/drivers/pinctrl/freescale/pinctrl-imx1-core.c index 5ac59fbb2440..d3a3be7476e1 100644 --- a/drivers/pinctrl/freescale/pinctrl-imx1-core.c +++ b/drivers/pinctrl/freescale/pinctrl-imx1-core.c @@ -403,14 +403,13 @@ static int imx1_pinconf_set(struct pinctrl_dev *pctldev, unsigned num_configs) { struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev); - const struct imx1_pinctrl_soc_info *info = ipctl->info; int i; for (i = 0; i != num_configs; ++i) { imx1_write_bit(ipctl, pin_id, configs[i] & 0x01, MX1_PUEN); dev_dbg(ipctl->dev, "pinconf set pullup pin %s\n", - info->pins[pin_id].name); + pin_desc_get(pctldev, pin_id)->name); } return 0; |