From patchwork Thu Nov 22 19:52:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151814 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1150216ljp; Thu, 22 Nov 2018 11:52:47 -0800 (PST) X-Google-Smtp-Source: AFSGD/UG5hUlRCbt3Ic4GP3s5E9EoB/maEmUHqjFGIsiPnXOMBok0BHNN9prrUOVifF8pLXEmRd5 X-Received: by 2002:a17:902:2a66:: with SMTP id i93mr12312074plb.113.1542916367799; Thu, 22 Nov 2018 11:52:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542916367; cv=none; d=google.com; s=arc-20160816; b=QiqbkOtO2qM8FEHZv2Lo7xoenoxg7NK/E64zGXuoZMDc76+0Z8rc2rUFBNhJBW+aG4 ulmRMPe9E5vHpuYKzvOQ6AtK2mIriNXZG4KqLXD5aNbaRlernX3QC9sCKygrNtcVCWgO HQGqef2SExEdO456MWby/0vHCQtWwnTy+LdHzVEmekKezLD6wMwG0lMVourBYqDgFVNh pQLU9Lwn7pdwfNewiTfAMrrtY1TFMIAESUglbXHKcojhhceWpGJ28abu7qhsdiCvqDKV 10I/ERX1cMwFy1uwP35Ewlw+fBsPxsnNCrJq3+sPArO6IUJswubmQQZhoCNmMoM9GuIH LYaQ== 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=zC2sP55W6deeePX5mLquCDVAQY3STqIXdN8OHBVHfVk=; b=T0NcaoXPBAtSz4Pcwqg0b/wG/wAfkF6vIHVSU5k0nocVfg5qaEhSUF5jDSG9IKwrWM 9Zm5s26JGjfdaGmyFxS9KCTB0k1/HrAoy+oOyW7eh+yhQKpfPTQCFJl/1G56aGvJESZj EyF1KgNhrhOagZGDRw4kNCtVWH2EQz5lQNvx4pf4oBC7OUBbfabDdGOxHjfNz1DyOGP9 phsFYuUlFvG4Lu/BgHnLMAh8bMAoOClDqi42Yas5pVHkrVGKykxCDK7sjgWaF6uxkVf1 OVxYY9t02T0Oj3ofODYxi5ptuc0C0NfnpeZA+IsckjdgzR9TXRDTNdJ8DIHenZFDBP8+ gTrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=E5vQiEqZ; 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 n11-v6si52592511plg.300.2018.11.22.11.52.47; Thu, 22 Nov 2018 11:52:47 -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=E5vQiEqZ; 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 S2389441AbeKWGdh (ORCPT + 5 others); Fri, 23 Nov 2018 01:33:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:60928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389357AbeKWGdh (ORCPT ); Fri, 23 Nov 2018 01:33:37 -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 2F58620645; Thu, 22 Nov 2018 19:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542916366; bh=IkFzYftPQ5tYhMLnR6c4WhjzNhqWDlZCM7SgKeBafnc=; h=From:To:Cc:Subject:Date:From; b=E5vQiEqZPcrBaM+2Ie1Ygwwqf2jBIj4X3licXhVZyug0wd60evxWOYL813gMBClAc nqHAOQhCeYnfR4NUdL0W56cjJkBuYfpGhbhrNt5XpEdHCUhQFZeFhHVmmGAK+nXFS3 P5t67MYSIBuUFUwOnOTSsQXL275QZEjt3ebHd3DA= 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.19 01/36] pinctrl: meson: fix pinconf bias disable Date: Thu, 22 Nov 2018 14:52:05 -0500 Message-Id: <20181122195240.13123-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 29a458da78db..4f3ab18636a3 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -192,7 +192,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;