[PATCH] lib: utils:/gpio: Improve the sifive gpio driver

[Anup Patel]

+Green Wan  +Vincent Chen

On Mon, Oct 25, 2021 at 8:43 AM Xiang W <wxjstz at 126.com> wrote:
>
> 1. Add input support
> 2. Add pull-up support
> 3. Add ACTIVE_LOW support
>
> Signed-off-by: Xiang W <wxjstz at 126.com>

@Green/Vincent, it would be great if you can review this patch ?

Regards,
Anup

> ---
>  lib/utils/gpio/fdt_gpio_sifive.c | 55 ++++++++++++++++++++++++++++++++
>  1 file changed, 55 insertions(+)
>
> diff --git a/lib/utils/gpio/fdt_gpio_sifive.c b/lib/utils/gpio/fdt_gpio_sifive.c
> index 677f0fa..d113195 100644
> --- a/lib/utils/gpio/fdt_gpio_sifive.c
> +++ b/lib/utils/gpio/fdt_gpio_sifive.c
> @@ -18,8 +18,12 @@
>  #define SIFIVE_GPIO_PINS_MAX   32
>  #define SIFIVE_GPIO_PINS_DEF   16
>
> +#define SIFIVE_GPIO_INPUTVAL   0x00
> +#define SIFIVE_GPIO_INPUTEN    0x04
>  #define SIFIVE_GPIO_OUTEN      0x8
>  #define SIFIVE_GPIO_OUTVAL     0xc
> +#define SIFIVE_GPIO_PUE                0x10
> +#define SIFIVE_GPIO_OUTXOR     0x40
>  #define SIFIVE_GPIO_BIT(b)     (1U << (b))
>
>  struct sifive_gpio_chip {
> @@ -40,6 +44,20 @@ static int sifive_gpio_direction_output(struct gpio_pin *gp, int value)
>         v |= SIFIVE_GPIO_BIT(gp->offset);
>         writel(v, (volatile void *)(chip->addr + SIFIVE_GPIO_OUTEN));
>
> +       v = readl((volatile void *)(chip->addr + SIFIVE_GPIO_OUTXOR));
> +       if (gp->flags & GPIO_FLAG_ACTIVE_LOW)
> +               v |= SIFIVE_GPIO_BIT(gp->offset);
> +       else
> +               v &= ~SIFIVE_GPIO_BIT(gp->offset);
> +       writel(v, (volatile void *)(chip->addr + SIFIVE_GPIO_OUTXOR));
> +
> +       v = readl((volatile void *)(chip->addr + SIFIVE_GPIO_PUE));
> +       if (gp->flags & GPIO_FLAG_PULL_UP)
> +               v |= SIFIVE_GPIO_BIT(gp->offset);
> +       else
> +               v &= ~SIFIVE_GPIO_BIT(gp->offset);
> +       writel(v, (volatile void *)(chip->addr + SIFIVE_GPIO_PUE));
> +
>         v = readl((volatile void *)(chip->addr + SIFIVE_GPIO_OUTVAL));
>         if (!value)
>                 v &= ~SIFIVE_GPIO_BIT(gp->offset);
> @@ -50,6 +68,30 @@ static int sifive_gpio_direction_output(struct gpio_pin *gp, int value)
>         return 0;
>  }
>
> +static int sifive_gpio_direction_input(struct gpio_pin *gp)
> +{
> +       unsigned int v;
> +       struct sifive_gpio_chip *chip =
> +               container_of(gp->chip, struct sifive_gpio_chip, chip);
> +
> +       v = readl((volatile void *)(chip->addr + SIFIVE_GPIO_OUTEN));
> +       v &= ~SIFIVE_GPIO_BIT(gp->offset);
> +       writel(v, (volatile void *)(chip->addr + SIFIVE_GPIO_OUTEN));
> +
> +       v = readl((volatile void *)(chip->addr + SIFIVE_GPIO_INPUTEN));
> +       v |= SIFIVE_GPIO_BIT(gp->offset);
> +       writel(v, (volatile void *)(chip->addr + SIFIVE_GPIO_INPUTEN));
> +
> +       v = readl((volatile void *)(chip->addr + SIFIVE_GPIO_PUE));
> +       if (gp->flags & GPIO_FLAG_PULL_UP)
> +               v |= SIFIVE_GPIO_BIT(gp->offset);
> +       else
> +               v &= ~SIFIVE_GPIO_BIT(gp->offset);
> +       writel(v, (volatile void *)(chip->addr + SIFIVE_GPIO_PUE));
> +
> +       return 0;
> +}
> +
>  static void sifive_gpio_set(struct gpio_pin *gp, int value)
>  {
>         unsigned int v;
> @@ -64,6 +106,17 @@ static void sifive_gpio_set(struct gpio_pin *gp, int value)
>         writel(v, (volatile void *)(chip->addr + SIFIVE_GPIO_OUTVAL));
>  }
>
> +static int sifive_gpio_get(struct gpio_pin *gp)
> +{
> +       unsigned int v, invert;
> +       struct sifive_gpio_chip *chip =
> +               container_of(gp->chip, struct sifive_gpio_chip, chip);
> +       v = readl((volatile void *)(chip->addr + SIFIVE_GPIO_INPUTVAL));
> +       v = !!(v & SIFIVE_GPIO_BIT(gp->offset));
> +       invert = !!(gp->flags & GPIO_FLAG_ACTIVE_LOW);
> +       return v ^ invert;
> +}
> +
>  extern struct fdt_gpio fdt_gpio_sifive;
>
>  static int sifive_gpio_init(void *fdt, int nodeoff, u32 phandle,
> @@ -86,7 +139,9 @@ static int sifive_gpio_init(void *fdt, int nodeoff, u32 phandle,
>         chip->chip.id = phandle;
>         chip->chip.ngpio = SIFIVE_GPIO_PINS_DEF;
>         chip->chip.direction_output = sifive_gpio_direction_output;
> +       chip->chip.direction_input = sifive_gpio_direction_input;
>         chip->chip.set = sifive_gpio_set;
> +       chip->chip.get = sifive_gpio_get;
>         rc = gpio_chip_add(&chip->chip);
>         if (rc)
>                 return rc;
> --
> 2.30.2
>
>
> --
> opensbi mailing list
> opensbi at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/opensbi