From patchwork Tue Jun 12 10:56:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9219 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DF61423EB4 for ; Tue, 12 Jun 2012 10:56:58 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id A0467A1826B for ; Tue, 12 Jun 2012 10:56:58 +0000 (UTC) Received: by ghbz12 with SMTP id z12so3550641ghb.11 for ; Tue, 12 Jun 2012 03:56:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=UY2vvVyo3wb6wexwIuFM/uf3aPwb6gEyEN8C+XufA3E=; b=fB//55EbzmUo/ucnraQ/XRGAqN3pOHFJPwgzDsQmbtwW76eD8iD3/pw9QxFMXQ7HOO DgLszcN5Qf1Jgnniu9At8Bbz1yXajKUUNeAU/lYbf+7OgtS7a+IcajoAqKkAHF7N6gl1 G6I82wVEVL6Nu9SMkUTz+OD9OMmwGqc4X+TrFgAOdeuntowSk+tS9PjxvqIgC9XCGlVe 3Iafej/sEgPXe9sXx2OtWNdl7zyVDG88dX4Vhkog1k5LxYCfGUEnpSXjV2kXoOXXo1Cl nngBHLxgvTxXZrane6wMLbwpbheuN8JcOygYbBZd2MzaIfmcTwfRxVT8mhIIchOkH1B/ Maxw== Received: by 10.50.87.227 with SMTP id bb3mr7736478igb.57.1339498617846; Tue, 12 Jun 2012 03:56:57 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp158849ibb; Tue, 12 Jun 2012 03:56:56 -0700 (PDT) Received: by 10.14.100.136 with SMTP id z8mr6434201eef.197.1339498616017; Tue, 12 Jun 2012 03:56:56 -0700 (PDT) Received: from eu1sys200aog120.obsmtp.com (eu1sys200aog120.obsmtp.com. [207.126.144.149]) by mx.google.com with SMTP id n10si666139eef.122.2012.06.12.03.56.46 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 03:56:55 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.149 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.149; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.149 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob120.postini.com ([207.126.147.11]) with SMTP ID DSNKT9cgbgzgeGblZiycE7MnrQM9R2wzWGVy@postini.com; Tue, 12 Jun 2012 10:56:55 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id B8272A4; Tue, 12 Jun 2012 10:56:17 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id 726404D; Tue, 12 Jun 2012 08:08:30 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id ED809A8072; Tue, 12 Jun 2012 12:56:33 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 12 Jun 2012 12:56:38 +0200 From: Linus Walleij To: , Cc: Stephen Warren , Linus Walleij , Lee Jones Subject: [PATCH] pinctrl: nomadik: fix up typo Date: Tue, 12 Jun 2012 12:56:32 +0200 Message-ID: <1339498592-1435-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.9.2 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmZIfxFasNEoHd/np1pR0TNqbbQhXFJ2L4tby4vPu1Wk8R7ECI3nnpQnSwiGOfU93Q1JLhP Commit a60b57eddaa8af6c02cf7bbeb58ebf82881f08ac "drivers/gpio: gpio-nomadik: Add support for irqdomains" changed GPIO offset calculations to have this form: (gpio % NMK_GPIO_PER_CHIP) except in this one place for setting sleep mode, where the conversion was all wrong, and instead mod:ing the GPIO with the IRQ base which does not make any sense. So fix this up so we can use sleepmode. Cc: Lee Jones Signed-off-by: Linus Walleij --- drivers/pinctrl/pinctrl-nomadik.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index ba7122f..e8937e7 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -673,7 +673,7 @@ static void __nmk_gpio_set_wake(struct nmk_gpio_chip *nmk_chip, * wakeup is anyhow controlled by the RIMSC and FIMSC registers. */ if (nmk_chip->sleepmode && on) { - __nmk_gpio_set_slpm(nmk_chip, gpio % nmk_chip->chip.base, + __nmk_gpio_set_slpm(nmk_chip, gpio % NMK_GPIO_PER_CHIP, NMK_GPIO_SLPM_WAKEUP_ENABLE); }