Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-6
+3
-6
drivers/gpio/gpio-omap.c
+3
-6
drivers/gpio/gpio-omap.c
···
965
965
}
966
966
967
967
_gpio_rmw(base, bank->regs->irqenable, l, bank->regs->irqenable_inv);
968
-
_gpio_rmw(base, bank->regs->irqstatus, l,
969
-
bank->regs->irqenable_inv == false);
970
-
_gpio_rmw(base, bank->regs->irqenable, l, bank->regs->debounce_en != 0);
971
-
_gpio_rmw(base, bank->regs->irqenable, l, bank->regs->ctrl != 0);
968
+
_gpio_rmw(base, bank->regs->irqstatus, l, !bank->regs->irqenable_inv);
972
969
if (bank->regs->debounce_en)
973
-
_gpio_rmw(base, bank->regs->debounce_en, 0, 1);
970
+
__raw_writel(0, base + bank->regs->debounce_en);
974
971
975
972
/* Save OE default value (0xffffffff) in the context */
976
973
bank->context.oe = __raw_readl(bank->base + bank->regs->direction);
977
974
/* Initialize interface clk ungated, module enabled */
978
975
if (bank->regs->ctrl)
979
-
_gpio_rmw(base, bank->regs->ctrl, 0, 1);
976
+
__raw_writel(0, base + bank->regs->ctrl);
980
977
}
981
978
982
979
static __devinit void