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: 48109 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E2C4520553 for ; Thu, 7 May 2015 09:54:09 +0000 (UTC) Received: by wizk4 with SMTP id k4sf13974557wiz.2 for ; Thu, 07 May 2015 02:54:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=2YT9ZyFYbdLLjIeNBxiJAoY0W0VGAyveUGuWRsNOFE4=; b=QbsJP591S0hKtZtrEtiZ4vPZMboSTZ0pXbvrJtpmkmro3Jn9C8lzrlOXnODmDkUwfA N0Z5BFubWNMXzVqzxsb8G5aedTG1/fmU/pKVkDmS97NoBBApDYxJ7gxWXc6nI/65Pfzb q2pkscPjebZ/+LVtzzMZtACh1czwi+8gCEc+Cghzb/kUOgK/yph4Op1PNF9J8WsDdqTR i/ZtvwbTkGnLQw9EVpKrrTi1v+cQFNVKMMnprWIS0U5QuII8aQdRLZjPPqJwuWIGsI/b jC9eX0XkPuDjdaWk2fIJ/Kmri72EfEGg+DuO6xxvmChfD1Z5lntBORsErl5ViAdBNsXO Voog== X-Gm-Message-State: ALoCoQlMu2zO2SNY28zdc7lHLB8MDtcmntAGB/2gESDDYa7csC7T0cFFnWbGD3VIu+B/6gnDG4RA X-Received: by 10.112.28.111 with SMTP id a15mr1763548lbh.21.1430992449191; Thu, 07 May 2015 02:54:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.244.162 with SMTP id xh2ls183229lac.108.gmail; Thu, 07 May 2015 02:54:09 -0700 (PDT) X-Received: by 10.152.170.170 with SMTP id an10mr2377380lac.84.1430992449020; Thu, 07 May 2015 02:54:09 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id m5si970615laj.3.2015.05.07.02.54.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 May 2015 02:54:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbcga7 with SMTP id ga7so27038210lbc.1 for ; Thu, 07 May 2015 02:54:08 -0700 (PDT) X-Received: by 10.152.236.40 with SMTP id ur8mr2394128lac.19.1430992448882; Thu, 07 May 2015 02:54:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp3336659lbt; Thu, 7 May 2015 02:54:08 -0700 (PDT) X-Received: by 10.68.106.226 with SMTP id gx2mr5605894pbb.78.1430992445640; Thu, 07 May 2015 02:54:05 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qo1si2085466pdb.167.2015.05.07.02.54.04; Thu, 07 May 2015 02:54:05 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753348AbbEGJx4 (ORCPT + 29 others); Thu, 7 May 2015 05:53:56 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:33031 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752448AbbEGJxw (ORCPT ); Thu, 7 May 2015 05:53:52 -0400 Received: by lbbzk7 with SMTP id zk7so27040959lbb.0 for ; Thu, 07 May 2015 02:53:50 -0700 (PDT) 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-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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,