From patchwork Sat Jul 28 06:58:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1251351 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 3D689E00C1 for ; Sat, 28 Jul 2012 07:07:01 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sv10G-0007ey-Hd; Sat, 28 Jul 2012 06:59:56 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sv0zQ-0007di-R2 for linux-arm-kernel@lists.infradead.org; Sat, 28 Jul 2012 06:59:05 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq13so6832454pbb.36 for ; Fri, 27 Jul 2012 23:59:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=zcbHDbc32LIwNINo3b0CeQPilZNCLAHeadsgoGGCE0M=; b=WOPs6KwLmFwUGK98jjnmZbPDQWyX8JdnAd0LDDDX/ucEOlmJclrjYkWpVpYpV68Qyj ZLMQ0c0Jic6CCfYxSyrgmcZXs47odSkS0z40UWJAqT7eeg7SfUna0lwzJVy4hRU+KWpt UKXuoiCsvkwWyABsg9lXSaXUfDn+ne4K+LaoFfmpl+e4kA7H0tiYvcjUNFMdCfu4rsiH xYntnwavQ64Ns8Nf/hQB53j94zwKUk1uKs8jrC6Q6qdpoRS4e3qdQqKC8sAWOGY+02jf GP2bLAqbU81e7XdJS3QXK9ElU1IAbKE4MiCM+EovrY7UzBIJ2FfR66RgmPJMCeMe2CEA yflg== Received: by 10.68.232.103 with SMTP id tn7mr19279869pbc.86.1343458741476; Fri, 27 Jul 2012 23:59:01 -0700 (PDT) Received: from localhost ([221.239.195.16]) by mx.google.com with ESMTPS id rs4sm3458784pbc.0.2012.07.27.23.58.55 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 23:58:59 -0700 (PDT) From: Haojian Zhuang To: linux-arm-kernel@lists.infradead.org, grant.likely@secretlab.ca, linus.walleij@stericsson.com, arnd@arndb.de Subject: [PATCH 1/6] pinctrl: append new pins and groups in pxa910 Date: Sat, 28 Jul 2012 14:58:37 +0800 Message-Id: <1343458722-17127-2-git-send-email-haojian.zhuang@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343458722-17127-1-git-send-email-haojian.zhuang@gmail.com> References: <1343458722-17127-1-git-send-email-haojian.zhuang@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Note: SpamAssassin invocation failed Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Haojian Zhuang Acked-by: Linus Walleij --- drivers/pinctrl/pinctrl-pxa910.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-pxa910.c b/drivers/pinctrl/pinctrl-pxa910.c index c72ab4b..4164a6b 100644 --- a/drivers/pinctrl/pinctrl-pxa910.c +++ b/drivers/pinctrl/pinctrl-pxa910.c @@ -307,6 +307,7 @@ static struct pinctrl_pin_desc pxa910_pads[] = { PINCTRL_PIN(ND_RDY0, "ND_RDY0"), PINCTRL_PIN(SM_ADV, "SM_ADV"), PINCTRL_PIN(ND_RDY1, "ND_RDY1"), + PINCTRL_PIN(SM_ADVMUX, "SM_ADVMUX"), PINCTRL_PIN(SM_RDY, "SM_RDY"), PINCTRL_PIN(MMC1_DAT7, "MMC1_DAT7"), PINCTRL_PIN(MMC1_DAT6, "MMC1_DAT6"), @@ -504,6 +505,8 @@ static const unsigned p910_mmc1_pin1[] = {MMC1_DAT7, MMC1_DAT6, MMC1_DAT5, MMC1_CLK, MMC1_CD, GPIO99}; static const unsigned p910_mmc2_pin1[] = {GPIO33, GPIO34, GPIO35, GPIO36, GPIO37, GPIO38, GPIO39, GPIO40, GPIO41, GPIO42}; +static const unsigned p910_mmc2_pin2[] = {GPIO37, GPIO38, GPIO39, GPIO40, + GPIO41, GPIO42}; static const unsigned p910_mmc3_pin1[] = {GPIO33, GPIO34, GPIO35, GPIO36, GPIO49, GPIO50}; static const unsigned p910_mmc3_pin2[] = {ND_IO7, ND_IO6, ND_IO5, ND_IO4, @@ -674,6 +677,7 @@ static struct pxa3xx_pin_group pxa910_grps[] = { GRP_910("usim2 3p2", USIM2, p910_usim2_pin2), GRP_910("mmc1 12p", MMC1, p910_mmc1_pin1), GRP_910("mmc2 10p", MMC2, p910_mmc2_pin1), + GRP_910("mmc2 6p", MMC2, p910_mmc2_pin2), GRP_910("mmc3 6p", MMC3, p910_mmc3_pin1), GRP_910("mmc3 10p", MMC3, p910_mmc3_pin2), GRP_910("uart0 4p", UART0, p910_uart0_pin1), @@ -808,7 +812,7 @@ static struct pxa3xx_pin_group pxa910_grps[] = { static const char * const p910_usim2_grps[] = {"usim2 3p1", "usim2 3p2"}; static const char * const p910_mmc1_grps[] = {"mmc1 12p"}; -static const char * const p910_mmc2_grps[] = {"mmc2 10p"}; +static const char * const p910_mmc2_grps[] = {"mmc2 10p", "mmc2 6p"}; static const char * const p910_mmc3_grps[] = {"mmc3 6p", "mmc3 10p"}; static const char * const p910_uart0_grps[] = {"uart0 4p"}; static const char * const p910_uart1_grps[] = {"uart1 2p1", "uart1 2p2",