Commit 3c827873 authored by Matti Vaittinen's avatar Matti Vaittinen Committed by Linus Walleij
Browse files

pinctrl: Use new GPIO_LINE_DIRECTION 



Use newly added GPIO defines GPIO_LINE_DIRECTION_IN and
GPIO_LINE_DIRECTION_OUT instead of using hard-coded 1 and 0.

Main benefit is to make it easier to see which values mean IN and which
OUT. As a side effect this helps GPIO framework to change the direction
defines to something else if ever needed.

Please note that return value from get_direction call on
pinctrl-axp209 driver was changed. Previously pinctrl-axp209 might have
returned value 2 for direction INPUT.

Signed-off-by: default avatarMatti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarJacopo Mondi <jacopo+renesas@jmondi.org>
Link: https://lore.kernel.org/r/20200214135712.GA14557@localhost.localdomain


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 8587b21c

drivers/pinctrl/bcm/pinctrl-bcm2835.c

+4 −1
Original line number Diff line number Diff line
@@ -329,7 +329,10 @@ static int bcm2835_gpio_get_direction(struct gpio_chip *chip, unsigned int offse 
	if (fsel > BCM2835_FSEL_GPIO_OUT)

		return -EINVAL;



	return (fsel == BCM2835_FSEL_GPIO_IN);

	if (fsel == BCM2835_FSEL_GPIO_IN)

		return GPIO_LINE_DIRECTION_IN;



	return GPIO_LINE_DIRECTION_OUT;

}



static void bcm2835_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

drivers/pinctrl/bcm/pinctrl-iproc-gpio.c

+4 −1
Original line number Diff line number Diff line
@@ -363,7 +363,10 @@ static int iproc_gpio_get_direction(struct gpio_chip *gc, unsigned int gpio) 
	unsigned int offset = IPROC_GPIO_REG(gpio, IPROC_GPIO_OUT_EN_OFFSET);

	unsigned int shift = IPROC_GPIO_SHIFT(gpio);



	return !(readl(chip->base + offset) & BIT(shift));

	if (readl(chip->base + offset) & BIT(shift))

		return GPIO_LINE_DIRECTION_OUT;



	return GPIO_LINE_DIRECTION_IN;

}



static void iproc_gpio_set(struct gpio_chip *gc, unsigned gpio, int val)

drivers/pinctrl/mediatek/pinctrl-mtk-common.c

+4 −1
Original line number Diff line number Diff line
@@ -804,7 +804,10 @@ static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned offset) 
		pctl->devdata->spec_dir_set(&reg_addr, offset);



	regmap_read(pctl->regmap1, reg_addr, &read_val);

	return !(read_val & bit);

	if (read_val & bit)

		return GPIO_LINE_DIRECTION_OUT;



	return GPIO_LINE_DIRECTION_IN;

}



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

drivers/pinctrl/mediatek/pinctrl-paris.c

+4 −1
Original line number Diff line number Diff line
@@ -775,7 +775,10 @@ static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned int gpio) 
	if (err)

		return err;



	return !value;

	if (value)

		return GPIO_LINE_DIRECTION_OUT;



	return GPIO_LINE_DIRECTION_IN;

}



static int mtk_gpio_get(struct gpio_chip *chip, unsigned int gpio)

drivers/pinctrl/mvebu/pinctrl-armada-37xx.c

+4 −1
Original line number Diff line number Diff line
@@ -402,7 +402,10 @@ static int armada_37xx_gpio_get_direction(struct gpio_chip *chip, 
	mask = BIT(offset);

	regmap_read(info->regmap, reg, &val);



	return !(val & mask);

	if (val & mask)

		return GPIO_LINE_DIRECTION_OUT;



	return GPIO_LINE_DIRECTION_IN;

}



static int armada_37xx_gpio_direction_output(struct gpio_chip *chip,

CRA Git | Maintained and supported by SUSTech CRA and CCSE