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

Commit acd260b0 authored by Patrice Chotard's avatar Patrice Chotard Committed by Linus Walleij
Browse files

pinctrl: abx500: suppress hardcoded value 



Replace hardcoded value by corresponding #define's.

Signed-off-by: default avatarPatrice Chotard <patrice.chotard@st.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8b5abd18

drivers/pinctrl/pinctrl-abx500.c

+17 −4
Original line number Original line Diff line number Diff line
@@ -96,6 +96,9 @@ 
#define AB8540_GPIOX_VBAT_START	51

#define AB8540_GPIOX_VBAT_START	51

#define AB8540_GPIOX_VBAT_END	54

#define AB8540_GPIOX_VBAT_END	54





#define ABX500_GPIO_INPUT	0

#define ABX500_GPIO_OUTPUT	1



struct abx500_pinctrl {

struct abx500_pinctrl {

	struct device *dev;

	struct device *dev;

	struct pinctrl_dev *pctldev;

	struct pinctrl_dev *pctldev;
@@ -286,12 +289,18 @@ static int abx500_gpio_direction_output(struct gpio_chip *chip, 
	int ret;

	int ret;





	/* set direction as output */

	/* set direction as output */

	ret = abx500_gpio_set_bits(chip, AB8500_GPIO_DIR1_REG, offset, 1);

	ret = abx500_gpio_set_bits(chip,

				AB8500_GPIO_DIR1_REG,

				offset,

				ABX500_GPIO_OUTPUT);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;





	/* disable pull down */

	/* disable pull down */

	ret = abx500_gpio_set_bits(chip, AB8500_GPIO_PUD1_REG, offset, 1);

	ret = abx500_gpio_set_bits(chip,

				AB8500_GPIO_PUD1_REG,

				offset,

				ABX500_GPIO_PULL_NONE);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;
@@ -312,7 +321,10 @@ static int abx500_gpio_direction_output(struct gpio_chip *chip, 
static int abx500_gpio_direction_input(struct gpio_chip *chip, unsigned offset)

static int abx500_gpio_direction_input(struct gpio_chip *chip, unsigned offset)

{

{

	/* set the register as input */

	/* set the register as input */

	return abx500_gpio_set_bits(chip, AB8500_GPIO_DIR1_REG, offset, 0);

	return abx500_gpio_set_bits(chip,

				AB8500_GPIO_DIR1_REG,

				offset,

				ABX500_GPIO_INPUT);

}

}





static int abx500_gpio_to_irq(struct gpio_chip *chip, unsigned offset)

static int abx500_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
@@ -1032,7 +1044,8 @@ static int abx500_pin_config_set(struct pinctrl_dev *pctldev, 
		else

		else

			/* Chip only supports pull down */

			/* Chip only supports pull down */

			ret = abx500_gpio_set_bits(chip, AB8500_GPIO_PUD1_REG,

			ret = abx500_gpio_set_bits(chip, AB8500_GPIO_PUD1_REG,

				offset, argument ? 0 : 1);

				offset,

				argument ? ABX500_GPIO_PULL_DOWN : ABX500_GPIO_PULL_NONE);

		break;

		break;





	case PIN_CONFIG_BIAS_PULL_UP:

	case PIN_CONFIG_BIAS_PULL_UP: