diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-03-09 21:29:25 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-03-09 21:29:25 -0500 |
| commit | cc998d8bc74341f6bbbcd63ab4449a6acfc45ee9 (patch) | |
| tree | 2f4e23fa1ceb83b3e720afd52d9a5ef2be26c77e /drivers/pinctrl/mediatek | |
| parent | d2d13ed01362ecddc3f76f9cca31b0cd5d663a7e (diff) | |
| parent | 81f70ba233d5f660e1ea5fe23260ee323af5d53a (diff) | |
Merge tag 'v4.5-rc5' into devel
Linux 4.5-rc5
Diffstat (limited to 'drivers/pinctrl/mediatek')
| -rw-r--r-- | drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index 342d85b9861f..2bbe6f7964a7 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c | |||
| @@ -353,6 +353,7 @@ static int mtk_pconf_parse_conf(struct pinctrl_dev *pctldev, | |||
| 353 | ret = mtk_pconf_set_pull_select(pctl, pin, true, false, arg); | 353 | ret = mtk_pconf_set_pull_select(pctl, pin, true, false, arg); |
| 354 | break; | 354 | break; |
| 355 | case PIN_CONFIG_INPUT_ENABLE: | 355 | case PIN_CONFIG_INPUT_ENABLE: |
| 356 | mtk_pmx_gpio_set_direction(pctldev, NULL, pin, true); | ||
| 356 | ret = mtk_pconf_set_ies_smt(pctl, pin, arg, param); | 357 | ret = mtk_pconf_set_ies_smt(pctl, pin, arg, param); |
| 357 | break; | 358 | break; |
| 358 | case PIN_CONFIG_OUTPUT: | 359 | case PIN_CONFIG_OUTPUT: |
| @@ -360,6 +361,7 @@ static int mtk_pconf_parse_conf(struct pinctrl_dev *pctldev, | |||
| 360 | ret = mtk_pmx_gpio_set_direction(pctldev, NULL, pin, false); | 361 | ret = mtk_pmx_gpio_set_direction(pctldev, NULL, pin, false); |
| 361 | break; | 362 | break; |
| 362 | case PIN_CONFIG_INPUT_SCHMITT_ENABLE: | 363 | case PIN_CONFIG_INPUT_SCHMITT_ENABLE: |
| 364 | mtk_pmx_gpio_set_direction(pctldev, NULL, pin, true); | ||
| 363 | ret = mtk_pconf_set_ies_smt(pctl, pin, arg, param); | 365 | ret = mtk_pconf_set_ies_smt(pctl, pin, arg, param); |
| 364 | break; | 366 | break; |
| 365 | case PIN_CONFIG_DRIVE_STRENGTH: | 367 | case PIN_CONFIG_DRIVE_STRENGTH: |