From patchwork Sat Oct 18 12:57:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 39021 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 964E7202DB for ; Sat, 18 Oct 2014 12:58:07 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id a1sf1249813wgh.1 for ; Sat, 18 Oct 2014 05:58:06 -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=Vv/tKLf9/zUajQfjhEmdpAZ6SThrKEiT1rVV5whZqik=; b=FkgWYJ5ITuhxP9EcSNx60P44fC4Vz+XjTTUVOzUMO/T1qVNbX3sH9yUuBW2uZVZk5Z Fm4oKZ+e7OouU+cp2sKDvMwgWcuVv8f1ywzmiqcw5PstSoj5xeJ1qAXHoLqCkTt6f5CG EtUfNQ/Iv+Qm4ZvCjJT2glU1uMhJQdTJQ7nTKjh99oFtC9VkAG+ETh4jbcNXf1FkmCmz 5vd9YLwcICtrcp4wq8KObcoX+hWKBqQhgGNm7Mh9DRypbuSi0eoV9pIA5sFL44Dr5b+t HTIABvoI4vvLdhWEdvOfOYvcUPGicT690vTcos9mSPQ697/pokr1kky6iPxbnWRpmf9n 8YnA== X-Gm-Message-State: ALoCoQlb4Iy/1umW8/o2ShYpb+kenSRDkVVdwFqhrFbALAE8tk9CBMbLts914142tPaGh0zkkjPY X-Received: by 10.181.29.105 with SMTP id jv9mr769637wid.1.1413637086813; Sat, 18 Oct 2014 05:58:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.4 with SMTP id t4ls334217laz.33.gmail; Sat, 18 Oct 2014 05:58:06 -0700 (PDT) X-Received: by 10.112.44.229 with SMTP id h5mr2456941lbm.86.1413637086450; Sat, 18 Oct 2014 05:58:06 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id yg7si6076557lbb.133.2014.10.18.05.58.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 18 Oct 2014 05:58:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id w7so1888175lbi.23 for ; Sat, 18 Oct 2014 05:58:06 -0700 (PDT) X-Received: by 10.152.116.102 with SMTP id jv6mr3781295lab.40.1413637086261; Sat, 18 Oct 2014 05:58:06 -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.84.229 with SMTP id c5csp43932lbz; Sat, 18 Oct 2014 05:58:05 -0700 (PDT) X-Received: by 10.70.34.100 with SMTP id y4mr15306975pdi.26.1413637084796; Sat, 18 Oct 2014 05:58:04 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bh8si116667pdb.178.2014.10.18.05.58.04 for ; Sat, 18 Oct 2014 05:58:04 -0700 (PDT) Received-SPF: none (google.com: linux-gpio-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 S1751618AbaJRM6D (ORCPT ); Sat, 18 Oct 2014 08:58:03 -0400 Received: from mail-la0-f43.google.com ([209.85.215.43]:36614 "EHLO mail-la0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751606AbaJRM6C (ORCPT ); Sat, 18 Oct 2014 08:58:02 -0400 Received: by mail-la0-f43.google.com with SMTP id mc6so1940445lab.2 for ; Sat, 18 Oct 2014 05:58:00 -0700 (PDT) X-Received: by 10.152.216.167 with SMTP id or7mr1979515lac.93.1413637080523; Sat, 18 Oct 2014 05:58:00 -0700 (PDT) Received: from localhost.localdomain (c83-254-157-117.bredband.comhem.se. [83.254.157.117]) by mx.google.com with ESMTPSA id dw2sm1313148lbc.38.2014.10.18.05.57.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Oct 2014 05:57:59 -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: nomadik: amend MMC/SD pins Date: Sat, 18 Oct 2014 14:57:53 +0200 Message-Id: <1413637073-3443-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-gpio@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.178 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: , There is a missing MMC/SD pin for MCDATDIR2 which is routed as alt B, add it to the MMC/SD pin group and functions. Signed-off-by: Linus Walleij --- drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c b/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c index ed39dcafd4f8..2cd71470f270 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c @@ -291,6 +291,7 @@ static const unsigned u0_a_1_pins[] = { STN8815_PIN_B4, STN8815_PIN_D5, static const unsigned mmcsd_a_1_pins[] = { STN8815_PIN_B10, STN8815_PIN_A10, STN8815_PIN_C11, STN8815_PIN_B11, STN8815_PIN_A11, STN8815_PIN_C12, STN8815_PIN_B12, STN8815_PIN_A12, STN8815_PIN_C13, STN8815_PIN_C15 }; +static const unsigned mmcsd_b_1_pins[] = { STN8815_PIN_D15 }; static const unsigned u1_a_1_pins[] = { STN8815_PIN_M2, STN8815_PIN_L1, STN8815_PIN_F3, STN8815_PIN_F2 }; static const unsigned i2c1_a_1_pins[] = { STN8815_PIN_L4, STN8815_PIN_L3 }; @@ -305,6 +306,7 @@ static const unsigned i2cusb_b_1_pins[] = { STN8815_PIN_C21, STN8815_PIN_C20 }; static const struct nmk_pingroup nmk_stn8815_groups[] = { STN8815_PIN_GROUP(u0_a_1, NMK_GPIO_ALT_A), STN8815_PIN_GROUP(mmcsd_a_1, NMK_GPIO_ALT_A), + STN8815_PIN_GROUP(mmcsd_b_1, NMK_GPIO_ALT_B), STN8815_PIN_GROUP(u1_a_1, NMK_GPIO_ALT_A), STN8815_PIN_GROUP(i2c1_a_1, NMK_GPIO_ALT_A), STN8815_PIN_GROUP(i2c0_a_1, NMK_GPIO_ALT_A), @@ -317,7 +319,7 @@ static const struct nmk_pingroup nmk_stn8815_groups[] = { static const char * const a##_groups[] = { b }; STN8815_FUNC_GROUPS(u0, "u0_a_1"); -STN8815_FUNC_GROUPS(mmcsd, "mmcsd_a_1"); +STN8815_FUNC_GROUPS(mmcsd, "mmcsd_a_1", "mmcsd_b_1"); STN8815_FUNC_GROUPS(u1, "u1_a_1", "u1_b_1"); STN8815_FUNC_GROUPS(i2c1, "i2c1_a_1"); STN8815_FUNC_GROUPS(i2c0, "i2c0_a_1");