From patchwork Sat Jul 28 06:58:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1251381 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 52363E006E for ; Sat, 28 Jul 2012 07:07:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sv13O-0007t9-HB; Sat, 28 Jul 2012 07:03:10 +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 1Sv10A-0007di-6a for linux-arm-kernel@lists.infradead.org; Sat, 28 Jul 2012 06:59:50 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq13so6832454pbb.36 for ; Fri, 27 Jul 2012 23:59:46 -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=tcGN6AgmMgAXwgmkht9YviLhExV8XEQPgrjXlWBK8os=; b=uCR5AQ5hwZeuegihdqYAr1k0ZmTlKcp1lBgX3uIexdTAlbIZmTo8MezFhbVTt3PnPp /4KulW+LnuVGOdUnAmF9aHu4UtxLC5Ewfkyd+l9ms/xW4Sqzz9HvKoCvBex7MOxq6X6k dFoMH8ozDlP7HOjMyheI/+KLDurTiTegFzgwJ/tESdvEN/8SUgrWgp5Xx/O7/o+GZSbv toie1/JvYGLoM9OQd198fpc4j1+ia6Mt0qDcoaKdHsIz9J/KwfDw48yl+C+O3AKEzqXt b4PTcW+9bUMLzvo2tyBgbo0qZJWAzcI6A04sUT/UhCjloj5JCW20I7A9Z1+2hGko7F2J zBsg== Received: by 10.66.77.169 with SMTP id t9mr10470688paw.70.1343458786508; Fri, 27 Jul 2012 23:59:46 -0700 (PDT) Received: from localhost ([221.239.195.16]) by mx.google.com with ESMTPS id hf4sm3459174pbc.4.2012.07.27.23.59.42 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 23:59:45 -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 4/6] pinctrl: append new groups of mmp2 Date: Sat, 28 Jul 2012 14:58:40 +0800 Message-Id: <1343458722-17127-5-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-mmp2.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-mmp2.c b/drivers/pinctrl/pinctrl-mmp2.c index 25b9cd3..2c56de7 100644 --- a/drivers/pinctrl/pinctrl-mmp2.c +++ b/drivers/pinctrl/pinctrl-mmp2.c @@ -483,12 +483,14 @@ struct pxa3xx_mfp_pin mmp2_mfp[] = { static const unsigned mmp2_uart1_pin1[] = {GPIO29, GPIO30, GPIO31, GPIO32}; static const unsigned mmp2_uart1_pin2[] = {GPIO45, GPIO46}; static const unsigned mmp2_uart1_pin3[] = {GPIO140, GPIO141}; +static const unsigned mmp2_uart1_pin4[] = {GPIO29, GPIO30}; static const unsigned mmp2_uart2_pin1[] = {GPIO37, GPIO38, GPIO39, GPIO40}; static const unsigned mmp2_uart2_pin2[] = {GPIO43, GPIO44, GPIO45, GPIO46}; static const unsigned mmp2_uart2_pin3[] = {GPIO47, GPIO48, GPIO49, GPIO50}; static const unsigned mmp2_uart2_pin4[] = {GPIO74, GPIO75, GPIO76, GPIO77}; static const unsigned mmp2_uart2_pin5[] = {GPIO55, GPIO56}; static const unsigned mmp2_uart2_pin6[] = {GPIO140, GPIO141}; +static const unsigned mmp2_uart2_pin7[] = {GPIO47, GPIO48}; static const unsigned mmp2_uart3_pin1[] = {GPIO37, GPIO38, GPIO39, GPIO40}; static const unsigned mmp2_uart3_pin2[] = {GPIO43, GPIO44, GPIO45, GPIO46}; static const unsigned mmp2_uart3_pin3[] = {GPIO51, GPIO52, GPIO53, GPIO54}; @@ -552,12 +554,14 @@ static struct pxa3xx_pin_group mmp2_grps[] = { GRP_MMP2("uart1 4p1", UART1, mmp2_uart1_pin1), GRP_MMP2("uart1 2p2", UART1, mmp2_uart1_pin2), GRP_MMP2("uart1 2p3", UART1, mmp2_uart1_pin3), + GRP_MMP2("uart1 2p4", UART1, mmp2_uart1_pin4), GRP_MMP2("uart2 4p1", UART2, mmp2_uart2_pin1), GRP_MMP2("uart2 4p2", UART2, mmp2_uart2_pin2), GRP_MMP2("uart2 4p3", UART2, mmp2_uart2_pin3), GRP_MMP2("uart2 4p4", UART2, mmp2_uart2_pin4), GRP_MMP2("uart2 2p5", UART2, mmp2_uart2_pin5), GRP_MMP2("uart2 2p6", UART2, mmp2_uart2_pin6), + GRP_MMP2("uart2 2p7", UART2, mmp2_uart2_pin7), GRP_MMP2("uart3 4p1", UART3, mmp2_uart3_pin1), GRP_MMP2("uart3 4p2", UART3, mmp2_uart3_pin2), GRP_MMP2("uart3 4p3", UART3, mmp2_uart3_pin3), @@ -610,9 +614,9 @@ static struct pxa3xx_pin_group mmp2_grps[] = { }; static const char * const mmp2_uart1_grps[] = {"uart1 4p1", "uart1 2p2", - "uart1 2p3"}; + "uart1 2p3", "uart1 2p4"}; static const char * const mmp2_uart2_grps[] = {"uart2 4p1", "uart2 4p2", - "uart2 4p3", "uart2 4p4", "uart2 4p5", "uart2 4p6"}; + "uart2 4p3", "uart2 4p4", "uart2 2p5", "uart2 2p6", "uart2 2p7"}; static const char * const mmp2_uart3_grps[] = {"uart3 4p1", "uart3 4p2", "uart3 4p3", "uart3 4p4", "uart3 4p5", "uart3 2p6"}; static const char * const mmp2_uart4_grps[] = {"uart4 4p1", "uart4 4p2",