mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 13:53:33 +00:00
pinctrl/rockchip: support setting input-enable param
commit 42d90a1e5c
upstream.
Handle the PIN_CONFIG_INPUT_ENABLE param for configuring GPIOs as input.
Signed-off-by: Caleb Connolly <kc@postmarketos.org>
Link: https://lore.kernel.org/r/20220328005005.72492-3-kc@postmarketos.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1a16339d8b
commit
aaf27855fb
1 changed files with 11 additions and 1 deletions
|
@ -2144,7 +2144,7 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
|
|||
param = pinconf_to_config_param(configs[i]);
|
||||
arg = pinconf_to_config_argument(configs[i]);
|
||||
|
||||
if (param == (PIN_CONFIG_OUTPUT | PIN_CONFIG_INPUT_ENABLE)) {
|
||||
if (param == PIN_CONFIG_OUTPUT || param == PIN_CONFIG_INPUT_ENABLE) {
|
||||
/*
|
||||
* Check for gpio driver not being probed yet.
|
||||
* The lock makes sure that either gpio-probe has completed
|
||||
|
@ -2196,6 +2196,16 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,
|
|||
if (rc)
|
||||
return rc;
|
||||
break;
|
||||
case PIN_CONFIG_INPUT_ENABLE:
|
||||
rc = rockchip_set_mux(bank, pin - bank->pin_base,
|
||||
RK_FUNC_GPIO);
|
||||
if (rc != RK_FUNC_GPIO)
|
||||
return -EINVAL;
|
||||
|
||||
rc = gpio->direction_input(gpio, pin - bank->pin_base);
|
||||
if (rc)
|
||||
return rc;
|
||||
break;
|
||||
case PIN_CONFIG_DRIVE_STRENGTH:
|
||||
/* rk3288 is the first with per-pin drive-strength */
|
||||
if (!info->ctrl->drv_calc_reg)
|
||||
|
|
Loading…
Reference in a new issue