Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751507AbdH0Mz3 (ORCPT ); Sun, 27 Aug 2017 08:55:29 -0400 Received: from plaes.org ([188.166.43.21]:46152 "EHLO plaes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751435AbdH0Mz1 (ORCPT ); Sun, 27 Aug 2017 08:55:27 -0400 From: Priit Laes To: Maxime Ripard , Chen-Yu Tsai , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-sunxi@googlegroups.com, Priit Laes Subject: [PATCH] Revert "pinctrl: sunxi: Don't enforce bias disable (for now)" Date: Sun, 27 Aug 2017 15:55:23 +0300 Message-Id: <20170827125523.29208-1-plaes@plaes.org> X-Mailer: git-send-email 2.13.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 871 Lines: 27 This reverts commit 2154d94b40ea2a5de05245521371d0461bb0d669. The original patch was intented to avoid some issues with the sunxi gpio rework and was supposed to be reverted after all the required DT bits had been merged around v4.10. Signed-off-by: Priit Laes --- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c index 0dfd7fa66c48..52edf3b5988d 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c @@ -564,7 +564,8 @@ static int sunxi_pconf_group_set(struct pinctrl_dev *pctldev, val = arg / 10 - 1; break; case PIN_CONFIG_BIAS_DISABLE: - continue; + val = 0; + break; case PIN_CONFIG_BIAS_PULL_UP: if (arg == 0) return -EINVAL; -- 2.13.5