From patchwork Thu Nov 22 19:54:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151822 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1151953ljp; Thu, 22 Nov 2018 11:54:59 -0800 (PST) X-Google-Smtp-Source: AFSGD/WtHm5wgePYdYpUL0KaXyyIGcnBaZsgOO03Anj5AVXl5VaFALV9UDXgYZhMjXm3ue6DzOwv X-Received: by 2002:a17:902:b78b:: with SMTP id e11mr12595322pls.90.1542916499200; Thu, 22 Nov 2018 11:54:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542916499; cv=none; d=google.com; s=arc-20160816; b=kdZ54wsBbbEbxeuaXYZ9vRCklQo0sHw0vztORPsGS6NnwstGVVTu3kXTdV0YT4YWSz jd5DEbPvlbnBrecgQFTXHrLu54MMublq13EQ3oi+C5E0Hejs+IK2flJQV8+q7pfLvgNZ T/DBcLsqJwQr939w95tJLWqH+TFrtuzHYJ8f3XHoOXT3GXhfSSpoiuOcS8Ei9QzMWOsT KJ+ptczWuPTeNXMgp+uzXMywpi1xSFGtItR/ufxLYNCgsZdlMzP28mjBpOSxXuYAcW+S +FQ3lZYWaM3OOEVlVqRGmx7VMqIjt2qBVO8gOWLWuoC0+BT9w0aCMi2KGPlIKL/EVwUB M4yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=Y5IP0Tt6zdhbsD25wbG5uZ5CkQwn3GP98C6ht4F1hBw=; b=YCXUtigpJrCGl9uJ6G97kEKL1K0CAqL8Hg8Pvcj8eXmCImmH1YwmhYfXgmmsIiRKym 4fqKIi2JXrFPgWoCp8NxQTM/VqL8JbF4BbcdrwWMKDstbcJ19IEQ8f/Xovx10geyiKWF yG9I88XJrZudqvnl2fxZAgrJjagAZjZxP5IMQloWvMJ0Dczat5aRzm7Uocu4DL3OQj7p Bd4ryEv/0qmz886CE01k0X967ug2JoEkfBO/nVUvAr0Q06RGRNU8QAeku40XLM0330Jx 8Rr+KvSTj+NThpZU6pD215NzDDkQlyNsI/NwmN4nHxvaxU2z5jqvof1V+nQdAgBNUELb DDAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mWmfiLKT; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b10si35322245plz.233.2018.11.22.11.54.59; Thu, 22 Nov 2018 11:54:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mWmfiLKT; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2438664AbeKWGfu (ORCPT + 5 others); Fri, 23 Nov 2018 01:35:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:34702 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392350AbeKWGft (ORCPT ); Fri, 23 Nov 2018 01:35:49 -0500 Received: from sasha-vm.mshome.net (unknown [37.142.5.207]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7E37920672; Thu, 22 Nov 2018 19:54:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542916497; bh=Wki2bQaeS1C/gLKiOeE56biX5LRCwvSsfPqaH356jRg=; h=From:To:Cc:Subject:Date:From; b=mWmfiLKTDfgIs4kXteaDGnlE/XEfxVNflMF6Bz9yrCgZQPtzqXjs3Z9Mhr+AVeMyr JMaBbU5+DKh6Lm1IVpTdoMkYkV1nSzPQEA+Lnk2gJCsak+3vefBpgY8ihwd5qOvci4 KIoDZEo63wdhV7dNjNLTrvum1YXQ/2I5UXGwgKG8= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jerome Brunet , Linus Walleij , Sasha Levin , linux-gpio@vger.kernel.org, linux-amlogic@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 01/21] pinctrl: meson: fix pinconf bias disable Date: Thu, 22 Nov 2018 14:54:32 -0500 Message-Id: <20181122195452.13520-1-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Jerome Brunet [ Upstream commit e39f9dd8206ad66992ac0e6218ef1ba746f2cce9 ] If a bias is enabled on a pin of an Amlogic SoC, calling .pin_config_set() with PIN_CONFIG_BIAS_DISABLE will not disable the bias. Instead it will force a pull-down bias on the pin. Instead of the pull type register bank, the driver should access the pull enable register bank. Fixes: 6ac730951104 ("pinctrl: add driver for Amlogic Meson SoCs") Signed-off-by: Jerome Brunet Acked-by: Neil Armstrong Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/meson/pinctrl-meson.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index 66ed70c12733..6c43322dbb97 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -273,7 +273,7 @@ static int meson_pinconf_set(struct pinctrl_dev *pcdev, unsigned int pin, dev_dbg(pc->dev, "pin %u: disable bias\n", pin); meson_calc_reg_and_bit(bank, pin, REG_PULL, ®, &bit); - ret = regmap_update_bits(pc->reg_pull, reg, + ret = regmap_update_bits(pc->reg_pullen, reg, BIT(bit), 0); if (ret) return ret;