From patchwork Wed Jul 8 14:14:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 492951 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 809411402C9 for ; Thu, 9 Jul 2015 00:14:34 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934315AbbGHOOS (ORCPT ); Wed, 8 Jul 2015 10:14:18 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:36430 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758277AbbGHOON (ORCPT ); Wed, 8 Jul 2015 10:14:13 -0400 Received: by wgxm20 with SMTP id m20so13854558wgx.3 for ; Wed, 08 Jul 2015 07:14:12 -0700 (PDT) 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=PbgGt5GXOEtYLQmoHWhl+3WR6T5G3wf/N6GvrAHeoeI=; b=fjUCqT8oY67LYHc60Q8qyj/SsHXbpIhGIpl74q0pqi+QlTLV5Ph/NEYJEun0gegD/i epkCVxkQAbGBqtz0DWlroOvrnL08/QsvEV22s/OEj9OCvw4WBsD1lG7+7vpIIeZnxx90 Q0giDZ6Uo8HyKy17pMdOzhkszfbuj1eykPKUoOEC6LZOjmOB6Y0S+2RqVrbXELxwxWIr AYv93ikyIchL7OmPyRHj0FMYjfwNApenYCGbNsuwUkovdffxYea8PVQg84tIcudkWTBz qy5njHn97XWpwZzebK+Rq3UM0YpWGw/tu5nBeZDkrRP+veJIQ4lzLeyR5tGu8LdJlv+2 g0Lg== X-Gm-Message-State: ALoCoQmn1uoqZNP1PT9FMqlMzSc50Fntw2yid9ElJwD5Q6klLf8J5OyLaIYU9GaxkEcbNnyTzdGX X-Received: by 10.194.246.105 with SMTP id xv9mr20225538wjc.135.1436364852597; Wed, 08 Jul 2015 07:14:12 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by smtp.gmail.com with ESMTPSA id q3sm3683745wjr.38.2015.07.08.07.14.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jul 2015 07:14:11 -0700 (PDT) From: Linus Walleij To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-gpio@vger.kernel.org, Linus Walleij Subject: [PATCH] pinctrl: abx500: remove strict mode Date: Wed, 8 Jul 2015 16:14:06 +0200 Message-Id: <1436364846-11471-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Commit a21763a0b1e5a5ab8310f581886d04beadc16616 "pinctrl: nomadik: activate strict mux mode" put all Nomadik pin controllers to strict mode. This was not good on the Snowball platform: the muxing of GPIOs to different pins is done with hogs in the DTS file, and then these GPIOs are used by offset, relying on hogs to mux the pins. Since that means the pin controller "owns" the pins and at the same time we have a GPIO user, this pin controller is by definition not strict. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-ab8500.dtsi | 4 ---- drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 - 2 files changed, 5 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi index 9b69bce9297d..165c1bac61b1 100644 --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi @@ -231,10 +231,6 @@ */ gpio26 { gpio26_default_mode: gpio26_default { - default_mux { - function = "gpio"; - groups = "gpio26_d_1"; - }; default_cfg { pins = "GPIO26_M16"; output-low; diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c index 557d0f2a3031..97681fac082e 100644 --- a/drivers/pinctrl/nomadik/pinctrl-abx500.c +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c @@ -787,7 +787,6 @@ static const struct pinmux_ops abx500_pinmux_ops = { .set_mux = abx500_pmx_set, .gpio_request_enable = abx500_gpio_request_enable, .gpio_disable_free = abx500_gpio_disable_free, - .strict = true, }; static int abx500_get_groups_cnt(struct pinctrl_dev *pctldev)