gpio: msm_gpio: add .set_flags op

The .direction_input and .direction_output ops are deprecated, and don't
seem to behave properly for us. Implement our own .set_flags op to
handle this correctly.

Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
This commit is contained in:
Caleb Connolly 2024-04-03 14:07:43 +02:00
parent 491a981577
commit 4527991563
No known key found for this signature in database
GPG Key ID: 0583312B195F64B6

View File

@ -35,19 +35,19 @@ struct msm_gpio_bank {
#define GPIO_IN_OUT_REG(dev, x) \
(GPIO_CONFIG_REG(dev, x) + 0x4)
static int msm_gpio_direction_input(struct udevice *dev, unsigned int gpio)
static void msm_gpio_direction_input(struct udevice *dev, unsigned int gpio)
{
struct msm_gpio_bank *priv = dev_get_priv(dev);
/* Always NOP for special pins, assume they're in the correct state */
if (qcom_is_special_pin(priv->pin_data, gpio))
return 0;
return;
/* Disable OE bit */
clrsetbits_le32(priv->base + GPIO_CONFIG_REG(dev, gpio),
GPIO_OE_MASK, GPIO_OE_DISABLE);
return 0;
return;
}
static int msm_gpio_set_value(struct udevice *dev, unsigned int gpio, int value)
@ -84,6 +84,23 @@ static int msm_gpio_direction_output(struct udevice *dev, unsigned int gpio,
return 0;
}
static int msm_gpio_set_flags(struct udevice *dev, unsigned int gpio, ulong flags)
{
if (flags & GPIOD_IS_OUT_ACTIVE) {
return msm_gpio_direction_output(dev, gpio, 1);
} else if (flags & GPIOD_IS_OUT) {
return msm_gpio_direction_output(dev, gpio, 0);
} else if (flags & GPIOD_IS_IN) {
msm_gpio_direction_input(dev, gpio);
if (flags & GPIOD_PULL_UP)
return msm_gpio_set_value(dev, gpio, 1);
else if (flags & GPIOD_PULL_DOWN)
return msm_gpio_set_value(dev, gpio, 0);
}
return 0;
}
static int msm_gpio_get_value(struct udevice *dev, unsigned int gpio)
{
struct msm_gpio_bank *priv = dev_get_priv(dev);
@ -110,10 +127,8 @@ static int msm_gpio_get_function(struct udevice *dev, unsigned int gpio)
}
static const struct dm_gpio_ops gpio_msm_ops = {
.direction_input = msm_gpio_direction_input,
.direction_output = msm_gpio_direction_output,
.set_flags = msm_gpio_set_flags,
.get_value = msm_gpio_get_value,
.set_value = msm_gpio_set_value,
.get_function = msm_gpio_get_function,
};