projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a481162
)
pinctrl: qcom-spmi-gpio: Fix output type configuration
author
Ivan T. Ivanov
<
[email protected]
>
Thu, 9 Apr 2015 15:18:35 +0000
(18:18 +0300)
committer
Linus Walleij
<
[email protected]
>
Tue, 28 Apr 2015 12:51:11 +0000
(14:51 +0200)
GPIO output type configuration was incorrectly overwritten
by strength value. Fix this.
Signed-off-by: Ivan T. Ivanov <
[email protected]
>
Acked-by: Bjorn Andersson <
[email protected]
>
Signed-off-by: Linus Walleij <
[email protected]
>
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
patch
|
blob
|
history
diff --git
a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
index b2d22218a2582f94b2c5d0274843fa0c2d3d7162..4b21aac43216169bae6ff8308388cd4d686df066 100644
(file)
--- a/
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
+++ b/
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
@@
-417,7
+417,7
@@
static int pmic_gpio_config_set(struct pinctrl_dev *pctldev, unsigned int pin,
return ret;
val = pad->buffer_type << PMIC_GPIO_REG_OUT_TYPE_SHIFT;
- val = pad->strength << PMIC_GPIO_REG_OUT_STRENGTH_SHIFT;
+ val
|
= pad->strength << PMIC_GPIO_REG_OUT_STRENGTH_SHIFT;
ret = pmic_gpio_write(state, pad, PMIC_GPIO_REG_DIG_OUT_CTL, val);
if (ret < 0)