From patchwork Thu Jul 5 08:39:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9829 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C42F223E1B for ; Thu, 5 Jul 2012 08:40:40 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 7DC4DA1825A for ; Thu, 5 Jul 2012 08:40:40 +0000 (UTC) Received: by yhpp61 with SMTP id p61so8584164yhp.11 for ; Thu, 05 Jul 2012 01:40:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=cNSwj1VO5W19br2Dzj+ZrrT699yYyRn0+1JVBL6sFHo=; b=B/Aiey+hcmNHTaIzPqcNT8k+oY7UngLQBAxekhNv56ht+M3WfqPKWspmu5QZVzPzfc vnBc/0RJSA+U+e9IEpTxas0iJV4JncPyzxWFkqg26/M46XHtprkGOKYA1TG23yEnDOND i7iIcdMp3M0dTd3F2BAW9gjlD27Jgh5MpjcgKoADZGehBGLLeJ/pMVrZ4VeQl0/JUyQB PWDIuBE6uqTvYHoYTkyRC9vOALAoNh/cVZhJyhrKxkl9SI5ZDpgpmGYr/aDQFsMeUrbG 2H2vn5EUjsUsHuq20Nfws1nrOwLdpApVgj6lDQf3OZCv0sEj3k7IFPKeVfUDHyNoiCzU oXJA== Received: by 10.50.160.198 with SMTP id xm6mr13552608igb.0.1341477639817; Thu, 05 Jul 2012 01:40:39 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp62503ibb; Thu, 5 Jul 2012 01:40:38 -0700 (PDT) Received: by 10.14.127.142 with SMTP id d14mr574436eei.169.1341477637939; Thu, 05 Jul 2012 01:40:37 -0700 (PDT) Received: from eu1sys200aog117.obsmtp.com (eu1sys200aog117.obsmtp.com. [207.126.144.143]) by mx.google.com with SMTP id b6si11255759eeg.138.2012.07.05.01.40.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 01:40:37 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.143 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.143; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.143 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob117.postini.com ([207.126.147.11]) with SMTP ID DSNKT/VS+8dL5jezft3oa21wt3O63RHIidnX@postini.com; Thu, 05 Jul 2012 08:40:37 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 70738166; Thu, 5 Jul 2012 08:40:00 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 2D2D12892; Thu, 5 Jul 2012 08:40:00 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id DA6CC24C2FD; Thu, 5 Jul 2012 10:39:49 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Thu, 5 Jul 2012 10:39:54 +0200 From: Linus Walleij To: , Cc: Stephen Warren , Patrice Chotard , Linus Walleij Subject: [PATCH] pinctrl/nomadik: add spi2_oc1_2 pin group Date: Thu, 5 Jul 2012 10:39:50 +0200 Message-ID: <1341477590-27321-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.9.2 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkRfphNaXdBVgWHQg1UeAz5Ln2hSZJu1cAwOJn+jdEOru+4G3gb1z4c6EitBIA+/yAgXmE/ From: Patrice Chotard On 8500 and 9540, all SPI2 pins are driven by SPI block except SPI2_FRM which is driven as GPIO due to specific constraints. A new group spi2_oc1_2 is created which exclude SPI2_FRM pin. Signed-off-by: Patrice Chotard Signed-off-by: Linus Walleij --- drivers/pinctrl/pinctrl-nomadik-db8500.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-nomadik-db8500.c b/drivers/pinctrl/pinctrl-nomadik-db8500.c index 9817493..6f99769 100644 --- a/drivers/pinctrl/pinctrl-nomadik-db8500.c +++ b/drivers/pinctrl/pinctrl-nomadik-db8500.c @@ -601,6 +601,8 @@ static const unsigned kp_oc1_1_pins[] = { DB8500_PIN_C6, DB8500_PIN_B3, DB8500_PIN_D6, DB8500_PIN_B7 }; static const unsigned spi2_oc1_1_pins[] = { DB8500_PIN_AH13, DB8500_PIN_AG12, DB8500_PIN_AH12, DB8500_PIN_AH11 }; +static const unsigned spi2_oc1_2_pins[] = { DB8500_PIN_AH13, DB8500_PIN_AH12, + DB8500_PIN_AH11 }; #define DB8500_PIN_GROUP(a,b) { .name = #a, .pins = a##_pins, \ .npins = ARRAY_SIZE(a##_pins), .altsetting = b } @@ -720,6 +722,7 @@ static const struct nmk_pingroup nmk_db8500_groups[] = { /* Other alt C1 column, these are still configured as alt C */ DB8500_PIN_GROUP(kp_oc1_1, NMK_GPIO_ALT_C), DB8500_PIN_GROUP(spi2_oc1_1, NMK_GPIO_ALT_C), + DB8500_PIN_GROUP(spi2_oc1_2, NMK_GPIO_ALT_C), }; /* We use this macro to define the groups applicable to a function */ @@ -795,7 +798,7 @@ DB8500_FUNC_GROUPS(mc5, "mc5_c_1"); DB8500_FUNC_GROUPS(usbsim, "usbsim_c_1", "usbsim_c_2"); DB8500_FUNC_GROUPS(i2c3, "i2c3_c_1", "i2c3_c_2"); DB8500_FUNC_GROUPS(spi0, "spi0_c_1"); -DB8500_FUNC_GROUPS(spi2, "spi2_oc1_1"); +DB8500_FUNC_GROUPS(spi2, "spi2_oc1_1", "spi2_oc1_2"); #define FUNCTION(fname) \ { \