Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2880dc13 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

gpio: pca953x: Improve bias setting 



commit 55a9968c7e139209a9e93d4ca4321731bea5fc95 upstream.

The commit 15add068 ("gpio: pca953x: add ->set_config implementation")
introduced support for bias setting. However this, due to being half-baked,
brought potential issues:
 - the turning bias via disabling makes the pin floating for a while;
 - once enabled, bias can't be disabled.

Fix all these by adding support for bias disabling and move the disabling
part under the corresponding conditional.

While at it, add support for default setting, since it's cheap to add.

Fixes: 15add068 ("gpio: pca953x: add ->set_config implementation")
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d8877453

drivers/gpio/gpio-pca953x.c

+9 −7
Original line number Diff line number Diff line
@@ -583,20 +583,20 @@ static int pca953x_gpio_set_pull_up_down(struct pca953x_chip *chip, 


	mutex_lock(&chip->i2c_lock);



	/* Disable pull-up/pull-down */

	ret = regmap_write_bits(chip->regmap, pull_en_reg, bit, 0);

	if (ret)

		goto exit;



	/* Configure pull-up/pull-down */

	if (config == PIN_CONFIG_BIAS_PULL_UP)

		ret = regmap_write_bits(chip->regmap, pull_sel_reg, bit, bit);

	else if (config == PIN_CONFIG_BIAS_PULL_DOWN)

		ret = regmap_write_bits(chip->regmap, pull_sel_reg, bit, 0);

	else

		ret = 0;

	if (ret)

		goto exit;



	/* Enable pull-up/pull-down */

	/* Disable/Enable pull-up/pull-down */

	if (config == PIN_CONFIG_BIAS_DISABLE)

		ret = regmap_write_bits(chip->regmap, pull_en_reg, bit, 0);

	else

		ret = regmap_write_bits(chip->regmap, pull_en_reg, bit, bit);



exit:
@@ -611,7 +611,9 @@ static int pca953x_gpio_set_config(struct gpio_chip *gc, unsigned int offset, 


	switch (pinconf_to_config_param(config)) {

	case PIN_CONFIG_BIAS_PULL_UP:

	case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT:

	case PIN_CONFIG_BIAS_PULL_DOWN:

	case PIN_CONFIG_BIAS_DISABLE:

		return pca953x_gpio_set_pull_up_down(chip, offset, config);

	default:

		return -ENOTSUPP;