From 5faa99eed069f1445623c3ff3f95bfb2c0e156ce Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Mon, 29 Aug 2011 18:54:50 +0530 Subject: [PATCH] --- yaml --- r: 295655 b: refs/heads/master c: 6d13eaaf33436e20d1a41122f28434bcc37999dc h: refs/heads/master i: 295653: dfb6e4d9fc9038dee8775ffe66f59e60181593b0 295651: 85ab1ab6a965675e9a23934c5b415faf6d96cb10 295647: 5f1c534ab7bcbcd34341754760d90868842d2bf3 v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-omap.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9b33267ad252..de09ab41c6b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba805be53cb9112917631d368f859af5e20d695f +refs/heads/master: 6d13eaaf33436e20d1a41122f28434bcc37999dc diff --git a/trunk/drivers/gpio/gpio-omap.c b/trunk/drivers/gpio/gpio-omap.c index 41265e823b23..e0fd2e4b2b9c 100644 --- a/trunk/drivers/gpio/gpio-omap.c +++ b/trunk/drivers/gpio/gpio-omap.c @@ -1355,7 +1355,6 @@ static void omap_gpio_restore_context(struct gpio_bank *bank) __raw_writel(bank->context.wake_en, bank->base + bank->regs->wkup_en); __raw_writel(bank->context.ctrl, bank->base + bank->regs->ctrl); - __raw_writel(bank->context.oe, bank->base + bank->regs->direction); __raw_writel(bank->context.leveldetect0, bank->base + bank->regs->leveldetect0); __raw_writel(bank->context.leveldetect1, @@ -1365,6 +1364,8 @@ static void omap_gpio_restore_context(struct gpio_bank *bank) __raw_writel(bank->context.fallingdetect, bank->base + bank->regs->fallingdetect); __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout); + __raw_writel(bank->context.oe, bank->base + bank->regs->direction); + if (bank->dbck_enable_mask) { __raw_writel(bank->context.debounce, bank->base + bank->regs->debounce);