From patchwork Tue Nov 13 10:55:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 997015 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="ux6NW9Sh"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42vPgP5Wmzz9s1c for ; Tue, 13 Nov 2018 21:56:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732227AbeKMUxe (ORCPT ); Tue, 13 Nov 2018 15:53:34 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:37097 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732153AbeKMUxe (ORCPT ); Tue, 13 Nov 2018 15:53:34 -0500 Received: by mail-wr1-f67.google.com with SMTP id o15-v6so12749576wrv.4 for ; Tue, 13 Nov 2018 02:55:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wt7pkL3la0ggYXUL0EKhSbI+tOA4s03vVHS9+1Kq4sc=; b=ux6NW9ShhTMAlzNi7lIpe327lxvhDDrySoRcEVsUGo/AjBDtTMNqzb+fKKLzdaMKIN EYuMspC8L3J/fE+srr+RWGopBDsCcfUkSrCFcDf+oEfCUkUFE0CGgIlC/T8bWyY6FdFS hYljbmOqJ36M3Y/rdkDBPWBxMvNptQWRYVANrH/xOXh+NWo0REjDuZkpHaACAyp2okN6 EtegoVwldn/xcWYR4IE46lUKB8kAeDI2g4NJwlHRLSWw9YXuJQERCzqBVGkAkA9iV9WW abdpCmUow+SGBML2TUDdj5ZFAH0T9huWq5KSfd+PRAVwnqdblnDvzsh84HoVLoAOogbR M7Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wt7pkL3la0ggYXUL0EKhSbI+tOA4s03vVHS9+1Kq4sc=; b=lkU6qk2Wu1BLJ8ACa2xQqK5iOKm6HzTOI+Fhm/UR5smS4zKp/GnM6GPSgeRlZujiBs +GBE3QgQAEJ8bYfNJZIoLHfIOJ7ODcIV0+ZCsCiFr2onfbFawiTNAq3M0cKowLLhcIxe rd3XRKr4B5nw7TP9pv6rH0FKYbs2jjTVUEemZ/c+kxBP1P6ndZrymqZ7eO9wObHdTyZz mLCRo7T4pkpVAfAq3ZmUSZnCCkBcqvQ8MyMXdTpEtjtYNUPNnw9topEp/EbkxsQX0nNX SaTYZqHETcM2IivcsCQZ6PChXsdr0Q67mBT8yUg6E7/9ulE3cMu423EGEdjBf7D0OQk9 ruPQ== X-Gm-Message-State: AGRZ1gKYk/gpJxoQKAxoEQEBEf+uNYFVKGIBGI/lSv6ZbkKgINJvHBSJ 7OW57tElMR9RCiF7g1qkMuW9Sw== X-Google-Smtp-Source: AJdET5dcFot088JbpfI+LtMUQon8sNzCV50XCdhWM+2SM9Me5OeYvSjrR8qP1WHEErDBe4mQYyML5Q== X-Received: by 2002:adf:83e3:: with SMTP id 90-v6mr4541797wre.278.1542106558646; Tue, 13 Nov 2018 02:55:58 -0800 (PST) Received: from boomer.local ([2a01:e34:eeb6:4690:106b:bae3:31ed:7561]) by smtp.googlemail.com with ESMTPSA id v9-v6sm20671096wrm.6.2018.11.13.02.55.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Nov 2018 02:55:57 -0800 (PST) From: Jerome Brunet To: Linus Walleij , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-gpio@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] pinctrl: meson: fix pull enable register calculation Date: Tue, 13 Nov 2018 11:55:36 +0100 Message-Id: <20181113105536.6459-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org We just changed the code so we apply bias disable on the correct register but forgot to align the register calculation. The result is that we apply the change on the correct register, but possibly at the incorrect offset/bit This went undetected because offsets tends to be the same between REG_PULL and REG_PULLEN for a given pin the EE controller. This is not true for the AO controller. Fixes: e39f9dd8206a ("pinctrl: meson: fix pinconf bias disable") Signed-off-by: Jerome Brunet Acked-by: Neil Armstrong --- drivers/pinctrl/meson/pinctrl-meson.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 53d449076dee..ea87d739f534 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -191,7 +191,8 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin, case PIN_CONFIG_BIAS_DISABLE: dev_dbg(pc->dev, "pin %u: disable bias\n", pin); - meson_calc_reg_and_bit(bank, pin, REG_PULL, ®, &bit); + meson_calc_reg_and_bit(bank, pin, REG_PULLEN, ®, + &bit); ret = regmap_update_bits(pc->reg_pullen, reg, BIT(bit), 0); if (ret)