From patchwork Thu May 7 09:53:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 469512 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 91799140283 for ; Thu, 7 May 2015 19:54:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753332AbbEGJxz (ORCPT ); Thu, 7 May 2015 05:53:55 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:34324 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752369AbbEGJxw (ORCPT ); Thu, 7 May 2015 05:53:52 -0400 Received: by lbcga7 with SMTP id ga7so27032992lbc.1 for ; Thu, 07 May 2015 02:53:50 -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=6iGDEKfp4Y16cAGCAsQz85XMb4pm9OJEEb/apM6ubnQ=; b=f2I3bQmsSEApFQ+qHooV9qU9zHD5JR89iCCxv848gKTgRa1kOLBftbotlYe4ZuVyEx I2Hrr7NBffCzL4p6gTB5NFJkVJvjJIBYtUGE7rRBY5s44MjpfaULICxhINURPPryciir kWU9zsLL67oHi7+wycPJFlQletgAiyluFmd0Rd9hNYu0bQOowHjtRdc+5aW2DOrrkqcu 4D+wxKtvdivoXH7xkVKb7nHYCHg/Fcb+w9Kyy0g5RuOB07uw8gXPJekLwtmNHeIZpbY8 +h9XFqTrM4Lf3FdM2X6eqXou+Z3jhUjDyM7eHWYeqSFw6X5Ms1qayTCyo8UIft6go6x/ 0smw== X-Gm-Message-State: ALoCoQn1TEEt/QcQU5FhbzIva0fdzZFL+URe8bLrrJ4URlUz/jRis+Pwg+4V7tZlRlfHVsnQTvl/ X-Received: by 10.112.172.35 with SMTP id az3mr1182466lbc.99.1430992429979; Thu, 07 May 2015 02:53:49 -0700 (PDT) Received: from localhost.localdomain.com (wlan-gw.se.axis.com. [195.60.68.7]) by mx.google.com with ESMTPSA id f2sm328292lah.39.2015.05.07.02.53.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 May 2015 02:53:49 -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 2/2] pinctrl: nomadik: activate strict mux mode Date: Thu, 7 May 2015 11:53:45 +0200 Message-Id: <1430992425-10818-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org This activates strict mode muxing for the Nomadik pin controllers, as these do not allow GPIO and functions to use the same pin simultaneously. Signed-off-by: Linus Walleij --- drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c index 23db4c9ac76c..15ccafd74dc6 100644 --- a/drivers/pinctrl/nomadik/pinctrl-abx500.c +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c @@ -787,6 +787,7 @@ 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) diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c index a6a22054c0ba..0c57edb2b222 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c @@ -1803,6 +1803,7 @@ static const struct pinmux_ops nmk_pinmux_ops = { .set_mux = nmk_pmx_set, .gpio_request_enable = nmk_gpio_request_enable, .gpio_disable_free = nmk_gpio_disable_free, + .strict = true, }; static int nmk_pin_config_get(struct pinctrl_dev *pctldev, unsigned pin,