From patchwork Mon Nov 14 12:23:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 82100 Delivered-To: patch@linaro.org Received: by 10.140.97.165 with SMTP id m34csp980687qge; Mon, 14 Nov 2016 04:23:59 -0800 (PST) X-Received: by 10.98.68.84 with SMTP id r81mr35573546pfa.174.1479126239677; Mon, 14 Nov 2016 04:23:59 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l14si22081889pfg.13.2016.11.14.04.23.59; Mon, 14 Nov 2016 04:23: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=neutral (body hash did not verify) header.i=@linaro.org; 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=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933750AbcKNMXl (ORCPT + 4 others); Mon, 14 Nov 2016 07:23:41 -0500 Received: from mail-lf0-f41.google.com ([209.85.215.41]:34642 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933623AbcKNMXj (ORCPT ); Mon, 14 Nov 2016 07:23:39 -0500 Received: by mail-lf0-f41.google.com with SMTP id o141so56888085lff.1 for ; Mon, 14 Nov 2016 04:23:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=ekAMC1IJfJOFC9prEqIzkayt0V4csj1cSF23lPPQt3I=; b=a3ApraRLURV1hjqPgspUXEPY4kpwasXxLr+dbylwQBtckEz91Y/Im4wvCyQqpeAX/m Uda4SOVp4L1GFVJuy0+alVhf3v8Y1QhFf7FhytroMEG5V6gy0JBIn55eHgBeuF6cT4iN /XfvtddAWV1K7l4m0jGTajTXdBI0VNvtXKVpc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ekAMC1IJfJOFC9prEqIzkayt0V4csj1cSF23lPPQt3I=; b=B4KwHBhOHdZn1OS0a+WLzVZZgX+nWsfvq2uq/cpLvAMYzCd3myViC4wmjZHXZ4XLYa kaYQtw2nu4nju7KFUzPRMDRLhfY2K+o8zS4LRbK8u8j4PjB7cw5bf6fNZOnZeYOw8WGT 5a7pAcffdfdqIjeJ/Hi0NsgHbLxx/hqN7zszkCexk7RLdxrdQOxs61TszfGDu7dqK/VC Ctl2L7+yQuNEK68JUP6jZApfeq8oYfd00eXUtnAO1E8zGHYAK9esW04798jyZNhSBydR V6svnmti7X4bZ/Sk/BNwoK+dovX8aXa0Y4LQhcoeGhk9kX62OlY+kzCRRoUJ+uFC8e2Y YVvg== X-Gm-Message-State: ABUngvfoHshD039wr66Vg42X6ix1svWMo8d97W98QoYIg7ovNx4LBzRngQbzRQMlfwX3f3dQ X-Received: by 10.25.32.195 with SMTP id g186mr437743lfg.157.1479126217770; Mon, 14 Nov 2016 04:23:37 -0800 (PST) Received: from linuslaptop.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id l34sm4960940lfi.4.2016.11.14.04.23.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 04:23:37 -0800 (PST) From: Linus Walleij To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-gpio@vger.kernel.org, Phil Elwell , Stefan Wahren , Eric Anholt , Stephen Warren , Linus Walleij Subject: [PATCH 2/2] pinctrl: bcm2835: Return pins to inputs when freed Date: Mon, 14 Nov 2016 13:23:34 +0100 Message-Id: <1479126214-20529-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Phil Elwell When dynamically unloading overlays, it is important that freed pins are restored to being inputs to prevent functions from being enabled in multiple places at once. Cc: Stefan Wahren Cc: Eric Anholt Cc: Stephen Warren Signed-off-by: Phil Elwell Signed-off-by: Linus Walleij --- I want to apply this to cater for my GPIOLIB_IRQCHIP refactorings. --- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Eric Anholt diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 1d8fc104e26b..2df59d9964a2 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -844,6 +844,16 @@ static const struct pinctrl_ops bcm2835_pctl_ops = { .dt_free_map = bcm2835_pctl_dt_free_map, }; +static int bcm2835_pmx_free(struct pinctrl_dev *pctldev, + unsigned offset) +{ + struct bcm2835_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev); + + /* disable by setting to GPIO_IN */ + bcm2835_pinctrl_fsel_set(pc, offset, BCM2835_FSEL_GPIO_IN); + return 0; +} + static int bcm2835_pmx_get_functions_count(struct pinctrl_dev *pctldev) { return BCM2835_FSEL_COUNT; @@ -903,6 +913,7 @@ static int bcm2835_pmx_gpio_set_direction(struct pinctrl_dev *pctldev, } static const struct pinmux_ops bcm2835_pmx_ops = { + .free = bcm2835_pmx_free, .get_functions_count = bcm2835_pmx_get_functions_count, .get_function_name = bcm2835_pmx_get_function_name, .get_function_groups = bcm2835_pmx_get_function_groups,