aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanimir Varbanov <svarbanov@mm-sol.com>2015-03-04 05:41:56 -0500
committerLinus Walleij <linus.walleij@linaro.org>2015-03-09 13:11:01 -0400
commit38d756af7202c7cb1fde0c132076b0a6acd0d9d7 (patch)
tree393f2801e7cf75f3daa430c536a2279d6a7a8ddf
parent11131ba435252cae6099c04417bcf83997ec3241 (diff)
pinctrl: qcom: enable generic pinconf
This makes the pinctrl driver to use the generic pinconf interface. Mainly it gives us a way to use debugfs to dump group configurations. Signed-off-by: Stanimir Varbanov <svarbanov@mm-sol.com> Acked-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/qcom/pinctrl-msm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
index a535f9c23678..d36e51172567 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -197,7 +197,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl,
197 *mask = 1; 197 *mask = 1;
198 break; 198 break;
199 default: 199 default:
200 dev_err(pctrl->dev, "Invalid config param %04x\n", param);
201 return -ENOTSUPP; 200 return -ENOTSUPP;
202 } 201 }
203 202
@@ -262,9 +261,7 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev,
262 arg = !!(val & BIT(g->in_bit)); 261 arg = !!(val & BIT(g->in_bit));
263 break; 262 break;
264 default: 263 default:
265 dev_err(pctrl->dev, "Unsupported config parameter: %x\n", 264 return -ENOTSUPP;
266 param);
267 return -EINVAL;
268 } 265 }
269 266
270 *config = pinconf_to_config_packed(param, arg); 267 *config = pinconf_to_config_packed(param, arg);
@@ -357,6 +354,7 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev,
357} 354}
358 355
359static const struct pinconf_ops msm_pinconf_ops = { 356static const struct pinconf_ops msm_pinconf_ops = {
357 .is_generic = true,
360 .pin_config_group_get = msm_config_group_get, 358 .pin_config_group_get = msm_config_group_get,
361 .pin_config_group_set = msm_config_group_set, 359 .pin_config_group_set = msm_config_group_set,
362}; 360};