Tarun Kanti DebBarma <[email protected]> writes:
> In the existing _set_gpio_dataout_*() implementation, the dataout
> register is overwritten every time the function is called. This is
> not intended behavior because that would end up one user of a GPIO
> line overwriting what is written by another. Fix this so that previous
> value is always preserved until explicitly changed by respective
> user/driver of the GPIO line.
>
> Signed-off-by: Tarun Kanti DebBarma <[email protected]>
> ---
> drivers/gpio/gpio-omap.c | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
> index 04c2677..2e8e476 100644
> --- a/drivers/gpio/gpio-omap.c
> +++ b/drivers/gpio/gpio-omap.c
> @@ -114,6 +114,7 @@ static void _set_gpio_dataout_reg(struct gpio_bank *bank,
> int gpio, int enable)
> else
> reg += bank->regs->clr_dataout;
>
> + l |= __raw_readl(bank->base + bank->regs->set_dataout);
minor: IMO, it's more reader-friendly if this looks like
l = __raw_read(...)
l |= GPIO_BIT(...)
__raw_write(...)
> __raw_writel(l, reg);
> bank->context.dataout = l;
> }
> @@ -130,6 +131,8 @@ static void _set_gpio_dataout_mask(struct gpio_bank
> *bank, int gpio, int enable)
> l |= gpio_bit;
> else
> l &= ~gpio_bit;
> +
> + l |= __raw_readl(bank->base + bank->regs->set_dataout);
There's already a __raw_read() in this function just above.
> __raw_writel(l, reg);
> bank->context.dataout = l;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
