diff options
| author | Colin Cross <ccross@android.com> | 2012-05-14 16:41:02 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-05-14 16:41:02 -0700 |
| commit | ec0b571c19ac62ab0bb80d373a3d4922a48b4b75 (patch) | |
| tree | 10c597f5227c969c3f2b909fbeb29725a0c5c6e8 /drivers/gpio/gpio-omap.c | |
| parent | 7bb8b65407a519d3a90dd8cecdd1ccd10ee0c6cc (diff) | |
| parent | 36be50515fe2aef61533b516fa2576a2c7fe7664 (diff) | |
Merge commit 'v3.4-rc7' into android-3.4
Diffstat (limited to 'drivers/gpio/gpio-omap.c')
| -rw-r--r-- | drivers/gpio/gpio-omap.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 1adc2ec1e38..4461540653a 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -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 |