From patchwork Tue Oct 23 16:03:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 988256 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="u3EoRmmQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42fdTt1Tz0z9sBN for ; Wed, 24 Oct 2018 03:03:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728146AbeJXA11 (ORCPT ); Tue, 23 Oct 2018 20:27:27 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:43038 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727962AbeJXA11 (ORCPT ); Tue, 23 Oct 2018 20:27:27 -0400 Received: by mail-wr1-f67.google.com with SMTP id t10-v6so2309140wrn.10 for ; Tue, 23 Oct 2018 09:03:27 -0700 (PDT) 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; bh=NeySEQtH2rtUcpAfpm/aL6G5MfPMD/6HAlrixUP8xB4=; b=u3EoRmmQ4PIP7zQCdY8rkkI8VpBK6hmYPjBE5N5ki6NdOslY7QX/cbUDKyDDQCwafu 3L8jRA7ksQ4DjaQcAyqfOdwW7/6X3DH1eghpKHFvvWItDmvH5fiXQEkAmEug9UCIRt9U W/GedCJsZpWJF/WHa4AJq6ae5LA1+qw8kcqNzN15WsLR62zz4en9EkILcsY/FNsT3JkS +RNJIBhMRj9bP6t2+H8zEgdgu0JHpObkNuN9KlSdf05seSNKXtry3Z1ut+q2pKBhfes9 I46LwkFDcVSGCaLWWUr2iD6+CqY05joPZZNNtWRV5k9MpXPSynLUuC64d02c0B7+guM2 iDMQ== 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; bh=NeySEQtH2rtUcpAfpm/aL6G5MfPMD/6HAlrixUP8xB4=; b=XnfMvJyapVMzuUXC2CBv9qXIAd0JgQxJNZ6ixV11jWuZ8mG/M6Qn7ulnpweHfDBjnq Oy0/GaNRaMWds9Q0cZbJOejvv7XXk3OX/1PtMaeJ3CqD2HkHEmVi+zlL0BZhuZg2uxD3 oD7UMGR6sS03sLyrFCC9qpLF9QUsucnt7amssA82g46+6anmofVD3m2vCBbOy4KA6glg uPgoLx/4a989Im7L8x5XG3RabDhUlvW0PcCFaIMfQ/9+dA5dkST78D7Dx3RgDbeEgZ5h +h9UFwMcHfQMDnOVYZqXVrpX//9bBsYsBVkC6aw56hm+W8KJZ0nHYuDA5gu5TtRyYVC4 9LVQ== X-Gm-Message-State: AGRZ1gJ0Pw0eC/PL9kzdaRbXPvDdl3mPRStvWLl1E2/IHucCa+DlA8a7 5FU6XFohuktZLa15aMkhNZ78BQ== X-Google-Smtp-Source: AJdET5dXBbuoau3TDOcSJ4oG0I1SJyPhlfakv+dqg7yknL+DGfOkoInU8rQl7DjZI1VVXU9rlfA2WQ== X-Received: by 2002:adf:b1db:: with SMTP id r27-v6mr9806606wra.95.1540310606641; Tue, 23 Oct 2018 09:03:26 -0700 (PDT) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id y19-v6sm2319910wra.60.2018.10.23.09.03.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Oct 2018 09:03:26 -0700 (PDT) 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 pinconf bias disable Date: Tue, 23 Oct 2018 18:03:19 +0200 Message-Id: <20181023160319.27003-1-jbrunet@baylibre.com> X-Mailer: git-send-email 2.17.2 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org 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 --- drivers/pinctrl/meson/pinctrl-meson.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;