torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

pinctrl: single: correct argument for pinconf

Browse Source 
pcs_pinconf_set() is always using "arg << shift" to configure two
parameters case. But pcs_add_conf2() didn't remove shift for config
argument. So correct it.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Haojian Zhuang 2013-03-13 16:01:26 +08:00 committed by Linus Walleij
parent ee341a99de
commit 7cba5b3f5f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pinctrl/pinctrl-single.c
View File

@ -623,8 +623,8 @@ static int pcs_pinconf_set(struct pinctrl_dev *pctldev,
{ {
struct pcs_device *pcs = pinctrl_dev_get_drvdata(pctldev); struct pcs_device *pcs = pinctrl_dev_get_drvdata(pctldev);
struct pcs_function *func; struct pcs_function *func;
unsigned offset = 0, shift = 0, arg = 0, i, data, ret; unsigned offset = 0, shift = 0, i, data, ret;
u16 argument; u16 arg;
ret = pcs_get_function(pctldev, pin, &func); ret = pcs_get_function(pctldev, pin, &func);
if (ret) if (ret)
@ -634,14 +634,13 @@ static int pcs_pinconf_set(struct pinctrl_dev *pctldev,
if (pinconf_to_config_param(config) == func->conf[i].param) { if (pinconf_to_config_param(config) == func->conf[i].param) {
offset = pin * (pcs->width / BITS_PER_BYTE); offset = pin * (pcs->width / BITS_PER_BYTE);
data = pcs->read(pcs->base + offset); data = pcs->read(pcs->base + offset);
argument = pinconf_to_config_argument(config); arg = pinconf_to_config_argument(config);
switch (func->conf[i].param) { switch (func->conf[i].param) {
/* 2 parameters */ /* 2 parameters */
case PIN_CONFIG_INPUT_SCHMITT: case PIN_CONFIG_INPUT_SCHMITT:
case PIN_CONFIG_DRIVE_STRENGTH: case PIN_CONFIG_DRIVE_STRENGTH:
case PIN_CONFIG_SLEW_RATE: case PIN_CONFIG_SLEW_RATE:
shift = ffs(func->conf[i].mask) - 1; shift = ffs(func->conf[i].mask) - 1;
arg = pinconf_to_config_argument(config);
data &= ~func->conf[i].mask; data &= ~func->conf[i].mask;
data |= (arg << shift) & func->conf[i].mask; data |= (arg << shift) & func->conf[i].mask;
break; break;
@ -651,12 +650,12 @@ static int pcs_pinconf_set(struct pinctrl_dev *pctldev,
break; break;
case PIN_CONFIG_BIAS_PULL_DOWN: case PIN_CONFIG_BIAS_PULL_DOWN:
case PIN_CONFIG_BIAS_PULL_UP: case PIN_CONFIG_BIAS_PULL_UP:
if (argument) if (arg)
pcs_pinconf_clear_bias(pctldev, pin); pcs_pinconf_clear_bias(pctldev, pin);
/* fall through */ /* fall through */
case PIN_CONFIG_INPUT_SCHMITT_ENABLE: case PIN_CONFIG_INPUT_SCHMITT_ENABLE:
data &= ~func->conf[i].mask; data &= ~func->conf[i].mask;
if (argument) if (arg)
data |= func->conf[i].enable; data |= func->conf[i].enable;
else else
data |= func->conf[i].disable; data |= func->conf[i].disable;
@ -965,7 +964,7 @@ static void pcs_add_conf2(struct pcs_device *pcs, struct device_node *np,
const char *name, enum pin_config_param param, const char *name, enum pin_config_param param,
struct pcs_conf_vals **conf, unsigned long **settings) struct pcs_conf_vals **conf, unsigned long **settings)
{ {
unsigned value[2]; unsigned value[2], shift;
int ret; int ret;
ret = of_property_read_u32_array(np, name, value, 2); ret = of_property_read_u32_array(np, name, value, 2);
@ -973,9 +972,10 @@ static void pcs_add_conf2(struct pcs_device *pcs, struct device_node *np,
return; return;
/* set value & mask */ /* set value & mask */
value[0] &= value[1]; value[0] &= value[1];
shift = ffs(value[1]) - 1;
/* skip enable & disable */ /* skip enable & disable */
add_config(conf, param, value[0], 0, 0, value[1]); add_config(conf, param, value[0], 0, 0, value[1]);
add_setting(settings, param, value[0]); add_setting(settings, param, value[0] >> shift);
} }
/* add pinconf setting with 4 parameters */ /* add pinconf setting with 4 parameters */