| Message ID | 20190404035140.3721-2-david.wu@rock-chips.com |
|---|---|
| State | Superseded |
| Delegated to: | Philipp Tomsich |
| Headers | show |
| Series | pinctrl: Split the common mux/drive/pull/schmitt func into per Soc | expand |
Hi David, Am Donnerstag, 4. April 2019, 05:51:31 CEST schrieb David Wu: > Some Socs use the pull-pin-default config param, need to add it. > > Signed-off-by: David Wu <david.wu@rock-chips.com> > --- > > drivers/pinctrl/rockchip/pinctrl-rockchip-core.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c > index b84b079064..77ac981c40 100644 > --- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c > +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c > @@ -509,9 +509,8 @@ static const struct pinconf_param rockchip_conf_params[] = { > { "bias-bus-hold", PIN_CONFIG_BIAS_BUS_HOLD, 0 }, > { "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 1 }, > { "bias-pull-down", PIN_CONFIG_BIAS_PULL_DOWN, 1 }, > + { "bias-pull-pin-default", PIN_CONFIG_BIAS_PULL_PIN_DEFAULT, 1 }, > { "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 0 }, > - { "input-enable", PIN_CONFIG_INPUT_ENABLE, 1 }, > - { "input-disable", PIN_CONFIG_INPUT_ENABLE, 0 }, you also remove these, is that intentional ... if so the commit message should explain it :-) Thanks Heiko > { "input-schmitt-disable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 0 }, > { "input-schmitt-enable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 1 }, > }; >
diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c index b84b079064..77ac981c40 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c @@ -509,9 +509,8 @@ static const struct pinconf_param rockchip_conf_params[] = { { "bias-bus-hold", PIN_CONFIG_BIAS_BUS_HOLD, 0 }, { "bias-pull-up", PIN_CONFIG_BIAS_PULL_UP, 1 }, { "bias-pull-down", PIN_CONFIG_BIAS_PULL_DOWN, 1 }, + { "bias-pull-pin-default", PIN_CONFIG_BIAS_PULL_PIN_DEFAULT, 1 }, { "drive-strength", PIN_CONFIG_DRIVE_STRENGTH, 0 }, - { "input-enable", PIN_CONFIG_INPUT_ENABLE, 1 }, - { "input-disable", PIN_CONFIG_INPUT_ENABLE, 0 }, { "input-schmitt-disable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 0 }, { "input-schmitt-enable", PIN_CONFIG_INPUT_SCHMITT_ENABLE, 1 }, };
Some Socs use the pull-pin-default config param, need to add it. Signed-off-by: David Wu <david.wu@rock-chips.com> --- drivers/pinctrl/rockchip/pinctrl-rockchip-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)