From patchwork Wed Nov 23 14:11:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 83682 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp2657650qge; Wed, 23 Nov 2016 06:12:33 -0800 (PST) X-Received: by 10.99.170.5 with SMTP id e5mr5608056pgf.46.1479910353656; Wed, 23 Nov 2016 06:12:33 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x184si20233408pgb.260.2016.11.23.06.12.33; Wed, 23 Nov 2016 06:12:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938640AbcKWOM3 (ORCPT + 25 others); Wed, 23 Nov 2016 09:12:29 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:34583 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935642AbcKWOMY (ORCPT ); Wed, 23 Nov 2016 09:12:24 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id D623D207CA; Wed, 23 Nov 2016 15:12:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from qschulz.home (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 8990820C6B; Wed, 23 Nov 2016 15:12:10 +0100 (CET) From: Quentin Schulz To: linus.walleij@linaro.org, gnurou@gmail.com, robh+dt@kernel.org, mark.rutland@arm.com, wens@csie.org, maxime.ripard@free-electrons.com Cc: Quentin Schulz , linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH RESEND 1/2] gpio: axp209: use correct register for GPIO input status Date: Wed, 23 Nov 2016 15:11:50 +0100 Message-Id: <20161123141151.25315-2-quentin.schulz@free-electrons.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161123141151.25315-1-quentin.schulz@free-electrons.com> References: <20161123141151.25315-1-quentin.schulz@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The GPIO input status was read from control register (AXP20X_GPIO[210]_CTRL) instead of status register (AXP20X_GPIO20_SS). Signed-off-by: Quentin Schulz --- drivers/gpio/gpio-axp209.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.9.3 diff --git a/drivers/gpio/gpio-axp209.c b/drivers/gpio/gpio-axp209.c index d9c2a51..4a346b7 100644 --- a/drivers/gpio/gpio-axp209.c +++ b/drivers/gpio/gpio-axp209.c @@ -64,13 +64,9 @@ static int axp20x_gpio_get(struct gpio_chip *chip, unsigned offset) { struct axp20x_gpio *gpio = gpiochip_get_data(chip); unsigned int val; - int reg, ret; - - reg = axp20x_gpio_get_reg(offset); - if (reg < 0) - return reg; + int ret; - ret = regmap_read(gpio->regmap, reg, &val); + ret = regmap_read(gpio->regmap, AXP20X_GPIO20_SS, &val); if (ret) return ret;