Commit bcc62fb0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6 

Pull GPIO omap bug fix from Grant Likely.

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  gpio/omap: fix incorrect initialization of omap_gpio_mod_init
parents ec53646f 6edd94db

drivers/gpio/gpio-omap.c

+3 −6
Original line number Diff line number Diff line
@@ -965,18 +965,15 @@ static void omap_gpio_mod_init(struct gpio_bank *bank) 
	}



	_gpio_rmw(base, bank->regs->irqenable, l, bank->regs->irqenable_inv);

	_gpio_rmw(base, bank->regs->irqstatus, l,

					bank->regs->irqenable_inv == false);

	_gpio_rmw(base, bank->regs->irqenable, l, bank->regs->debounce_en != 0);

	_gpio_rmw(base, bank->regs->irqenable, l, bank->regs->ctrl != 0);

	_gpio_rmw(base, bank->regs->irqstatus, l, !bank->regs->irqenable_inv);

	if (bank->regs->debounce_en)

		_gpio_rmw(base, bank->regs->debounce_en, 0, 1);

		__raw_writel(0, base + bank->regs->debounce_en);



	/* Save OE default value (0xffffffff) in the context */

	bank->context.oe = __raw_readl(bank->base + bank->regs->direction);

	 /* Initialize interface clk ungated, module enabled */

	if (bank->regs->ctrl)

		_gpio_rmw(base, bank->regs->ctrl, 0, 1);

		__raw_writel(0, base + bank->regs->ctrl);

}



static __devinit void