Message ID | 8a6f91b49c17beb218e46b23084f59a7c7260f86.1585124562.git.baolin.wang7@gmail.com |
---|---|
State | New |
Headers | show |
Series | [1/2] pinctrl: sprd: Use the correct pin output configuration | expand |
On Wed, Mar 25, 2020 at 9:25 AM Baolin Wang <baolin.wang7@gmail.com> wrote: > From: Linhua Xu <linhua.xu@unisoc.com> > > The Spreadtrum pin controller did not supply registers to set high level > or low level for output mode, instead we should let the pin controller > current configuration drive values on the line. So we should use the > PIN_CONFIG_OUTPUT_ENABLE configuration to enable or disable the output > mode. > > [Baolin Wang changes the commit message] > Fixes: 41d32cfce1ae ("pinctrl: sprd: Add Spreadtrum pin control driver") > Signed-off-by: Linhua Xu <linhua.xu@unisoc.com> > Signed-off-by: Baolin Wang <baolin.wang7@gmail.com> Patch applied. Yours, Linus Walleij
diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.c b/drivers/pinctrl/sprd/pinctrl-sprd.c index ea04bac..8e39610 100644 --- a/drivers/pinctrl/sprd/pinctrl-sprd.c +++ b/drivers/pinctrl/sprd/pinctrl-sprd.c @@ -464,7 +464,7 @@ static int sprd_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin_id, case PIN_CONFIG_INPUT_ENABLE: arg = (reg >> SLEEP_INPUT_SHIFT) & SLEEP_INPUT_MASK; break; - case PIN_CONFIG_OUTPUT: + case PIN_CONFIG_OUTPUT_ENABLE: arg = reg & SLEEP_OUTPUT_MASK; break; case PIN_CONFIG_DRIVE_STRENGTH: @@ -635,9 +635,13 @@ static int sprd_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin_id, shift = SLEEP_INPUT_SHIFT; } break; - case PIN_CONFIG_OUTPUT: + case PIN_CONFIG_OUTPUT_ENABLE: if (is_sleep_config == true) { - val |= SLEEP_OUTPUT; + if (arg > 0) + val |= SLEEP_OUTPUT; + else + val &= ~SLEEP_OUTPUT; + mask = SLEEP_OUTPUT_MASK; shift = SLEEP_OUTPUT_SHIFT; }