From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Hilman Subject: Re: [PATCH v6 25/25] gpio/omap: handle set_dataout reg capable IP on restore Date: Tue, 06 Sep 2011 17:07:55 -0700 Message-ID: <87mxehusdg.fsf@ti.com> References: <1314798161-19523-1-git-send-email-tarun.kanti@ti.com> <1314798161-19523-26-git-send-email-tarun.kanti@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from na3sys009aog101.obsmtp.com ([74.125.149.67]:42210 "EHLO na3sys009aog101.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751196Ab1IGAH7 (ORCPT ); Tue, 6 Sep 2011 20:07:59 -0400 Received: by mail-yw0-f46.google.com with SMTP id 7so5355693ywf.33 for ; Tue, 06 Sep 2011 17:07:58 -0700 (PDT) In-Reply-To: <1314798161-19523-26-git-send-email-tarun.kanti@ti.com> (Tarun Kanti DebBarma's message of "Wed, 31 Aug 2011 19:12:41 +0530") Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Tarun Kanti DebBarma Cc: linux-omap@vger.kernel.org, tony@atomide.com, linux-arm-kernel@lists.infradead.org, Nishanth Menon Tarun Kanti DebBarma writes: > From: Nishanth Menon > > GPIO IP revisions such as those used in OMAP4 have a set_dataout > while the previous revisions used a single dataout register. > Depending on what is available restore the dataout settings > to the right register. OK, minor nit below... > Signed-off-by: Nishanth Menon > Signed-off-by: Tarun Kanti DebBarma > Reviewed-by: Santosh Shilimkar > --- > drivers/gpio/gpio-omap.c | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c > index a629498..4680b4c 100644 > --- a/drivers/gpio/gpio-omap.c > +++ b/drivers/gpio/gpio-omap.c > @@ -1334,7 +1334,12 @@ static void omap_gpio_restore_context(struct gpio_bank *bank) > bank->base + bank->regs->risingdetect); > __raw_writel(bank->context.fallingdetect, > bank->base + bank->regs->fallingdetect); > - __raw_writel(bank->context.dataout, bank->base + bank->regs->dataout); > + if (bank->regs->set_dataout && bank->regs->clr_dataout) Why the check for ->clr_dataout here? > + __raw_writel(bank->context.dataout, > + bank->base + bank->regs->set_dataout); > + else > + __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) { Kevin