diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-06-16 12:06:26 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-06-16 12:06:26 +0800 |
| commit | a0f20736440d550d2fca63337c4f368e28a4a1ad (patch) | |
| tree | d12321a31c1f7505d61e910188238c4e7c2187ee /drivers/pinctrl | |
| parent | d138bf448fb2e66c6327f4036e6229c5ce6e525f (diff) | |
| parent | 1881384399daa2df6cef8117bc133f8f37fcbe83 (diff) | |
Merge branch 'v3.10/topic/pinctrl' into linux-linaro-lsk
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/pinconf.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/pinctrl/pinconf.c b/drivers/pinctrl/pinconf.c index ad30263a7410..596a2522a6b1 100644 --- a/drivers/pinctrl/pinconf.c +++ b/drivers/pinctrl/pinconf.c @@ -35,7 +35,9 @@ int pinconf_check_ops(struct pinctrl_dev *pctldev) return -EINVAL; } /* We have to be able to config the pins in SOME way */ - if (!ops->pin_config_set && !ops->pin_config_group_set) { + if (!ops->pin_config_set && !ops->pin_config_group_set + && !ops->pin_config_set_bulk + && !ops->pin_config_group_set_bulk) { dev_err(pctldev->dev, "pinconf has to be able to set a pins config\n"); return -EINVAL; @@ -171,14 +173,14 @@ int pinconf_apply_setting(struct pinctrl_setting const *setting) dev_err(pctldev->dev, "missing pin_config_set op\n"); return -EINVAL; } - if (ops->pin_config_group_set_bulk) { - ret = ops->pin_config_group_set_bulk(pctldev, + if (ops->pin_config_set_bulk) { + ret = ops->pin_config_set_bulk(pctldev, setting->data.configs.group_or_pin, setting->data.configs.configs, setting->data.configs.num_configs); if (ret < 0) { dev_err(pctldev->dev, - "pin_config_set op failed for pin %d\n", + "pin_config_set_bulk op failed for pin %d\n", setting->data.configs.group_or_pin); return ret; } @@ -211,7 +213,7 @@ int pinconf_apply_setting(struct pinctrl_setting const *setting) setting->data.configs.num_configs); if (ret < 0) { dev_err(pctldev->dev, - "pin_config_group_set op failed for group %d\n", + "pin_config_group_set_bulk op failed for group %d\n", setting->data.configs.group_or_pin); return ret; } |