From patchwork Thu Nov 22 19:56:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151825 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1153191ljp; Thu, 22 Nov 2018 11:56:29 -0800 (PST) X-Google-Smtp-Source: AFSGD/ViLAq9MxPEVIhhnBkhA2cjOsLsMbiBUzoUdgTCJcg5AIBh26MjMe8vy7M7aqn+l1WL9PJB X-Received: by 2002:a63:374e:: with SMTP id g14mr11427792pgn.59.1542916589279; Thu, 22 Nov 2018 11:56:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542916589; cv=none; d=google.com; s=arc-20160816; b=mCVO/EfXwHcY0VL5y84kTzOlKF9+ZPfSIA95i1wG5XxBZ36eSj1KP4unyVXAKjbVws mLexhWGSmN8eoBzKNrqenxQcbcFf5/K23CEq3EkYYkbB1lvZoj0zUExRsfM/JtkyPTmg ITsFRlqtCPVEEZskvUJeDLS+Xab8hjZg2Gq0bcNLDaKFb0cqUvIWY2PYxq8YKIZLT++g hNK92OhE4JvL0sNEyJ+RDhHEDBpvkBvMKn+hwZDGRUTpu1mjZexlQQFGFRcjyvIkUtza dCzCkiyIbRnIv/Oo4ZSkWbunCAVFsfgLxeos+/7aSVZceRWPYcJsqphgfOoqeiXdLfo+ 7Xog== 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=XDD5RvOdFL4xzSLzolB0YIOh2LKVEzrH9mINnykP7fQ=; b=E5MV40vWyIwb6rBkpV7ZoKkLYGiCo4JJiZcXCJSb8OQeQz2UI+YjzTuCR0oICE0qTy S/qebumG7rSuz1T59cdvk0hW0DdUFlhysJRvZkmmZIfRxZmV7bEqdFPdn9yJqyVL39qa RTqYNiI21tIU7z1njMBuXugjqeJkdyvqU9CYiYd+wX25xKOH8kyotbMEvFXuKqhStNRR tVbiOT8CgMgUx37nJSScMPgwXISf/6DKqJeTwNorsOn9fS7kAEjm+trMm8AY3+2YgO2f v9ZhGv6qJ6zHRkDrwov2Hamt/OogrzLcLUDJdXYlVv8IsiZTxU1zzNXbVy6brEzmqw/c 7Sdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QK2kK8bN; 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; 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 o195si28493021pfg.106.2018.11.22.11.56.28; Thu, 22 Nov 2018 11:56:29 -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; dkim=pass header.i=@kernel.org header.s=default header.b=QK2kK8bN; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407212AbeKWGhT (ORCPT + 32 others); Fri, 23 Nov 2018 01:37:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:36046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392369AbeKWGhS (ORCPT ); Fri, 23 Nov 2018 01:37:18 -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 85B9D20866; Thu, 22 Nov 2018 19:56:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542916586; bh=t4crbFRC4ZPWtFOAzFgmFBVAaWxoN8DQPthbbtjh/Zw=; h=From:To:Cc:Subject:Date:From; b=QK2kK8bNAQ7BIMTS3zv7SLCg5GpIWiuJfyIlNBagoIMHJDsVjyQRAqjJ98o+rmFin YHYbCnsDAzLKeM0PX5frQa+hf5vMDLVG/JqeKplPzZTmsK9EXO2JkBIpEROyvveisz zo9jRtb3FhrD/+7/XmykGFkrkjNwvqNBGIt26ONc= 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.9 01/15] pinctrl: meson: fix pinconf bias disable Date: Thu, 22 Nov 2018 14:56:07 -0500 Message-Id: <20181122195621.13776-1-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 9443c9d408c6..df61a71420b1 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -275,7 +275,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;