diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2017-08-22 15:32:28 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2017-08-22 15:32:28 +0200 |
| commit | dddd9663d16512ca42c11cd3d0410008a7d258f6 (patch) | |
| tree | 55d0074563956be7572b6290a08c7586a6abdeb0 /drivers/pinctrl/sh-pfc/pinctrl.c | |
| parent | pinctrl: aspeed: Fix ast2500 strap register write logic (diff) | |
| parent | pinctrl: sh-pfc: r8a77995: Add voltage switch operations for MMC (diff) | |
| download | linux-dddd9663d16512ca42c11cd3d0410008a7d258f6.tar.xz linux-dddd9663d16512ca42c11cd3d0410008a7d258f6.zip | |
Merge tag 'sh-pfc-for-v4.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
pinctrl: sh-pfc: Updates for v4.14
- Propagate errors on group config, now r8a7740-armadillo800eva.dts is
fixed,
- Add MSIOF and USB2.0 pin groups on R-Car H3 ES2.0,
- Add USB2.0 and USB3.0 pin groups on R-Car M3-W,
- Add a missing MMC pin group on R-Car M2-W and RZ/G1M,
- Add initial support for R-Car D3,
- Small fixes and cleanups.
Diffstat (limited to 'drivers/pinctrl/sh-pfc/pinctrl.c')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/pinctrl.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c index e7a92eec06c2..5c9d79981e6d 100644 --- a/drivers/pinctrl/sh-pfc/pinctrl.c +++ b/drivers/pinctrl/sh-pfc/pinctrl.c @@ -742,13 +742,16 @@ static int sh_pfc_pinconf_group_set(struct pinctrl_dev *pctldev, unsigned group, struct sh_pfc_pinctrl *pmx = pinctrl_dev_get_drvdata(pctldev); const unsigned int *pins; unsigned int num_pins; - unsigned int i; + unsigned int i, ret; pins = pmx->pfc->info->groups[group].pins; num_pins = pmx->pfc->info->groups[group].nr_pins; - for (i = 0; i < num_pins; ++i) - sh_pfc_pinconf_set(pctldev, pins[i], configs, num_configs); + for (i = 0; i < num_pins; ++i) { + ret = sh_pfc_pinconf_set(pctldev, pins[i], configs, num_configs); + if (ret) + return ret; + } return 0; } |