From patchwork Fri Jul 8 05:28:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huang Shijie X-Patchwork-Id: 103760 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 09451B6F67 for ; Fri, 8 Jul 2011 15:06:22 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qf3GP-0001c5-4X; Fri, 08 Jul 2011 05:06:05 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qf3GO-0002Z5-B3; Fri, 08 Jul 2011 05:06:04 +0000 Received: from db3ehsobe004.messaging.microsoft.com ([213.199.154.142] helo=DB3EHSOBE004.bigfish.com) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qf3G8-0002Vj-JF; Fri, 08 Jul 2011 05:05:49 +0000 Received: from mail86-db3-R.bigfish.com (10.3.81.240) by DB3EHSOBE004.bigfish.com (10.3.84.24) with Microsoft SMTP Server id 14.1.225.22; Fri, 8 Jul 2011 05:05:45 +0000 Received: from mail86-db3 (localhost.localdomain [127.0.0.1]) by mail86-db3-R.bigfish.com (Postfix) with ESMTP id D2B712F01A7; Fri, 8 Jul 2011 05:05:45 +0000 (UTC) X-SpamScore: 3 X-BigFish: VS3(zzzz1202h1082kzz8275bhz2dh2a8h668h839h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPVD:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail86-db3 (localhost.localdomain [127.0.0.1]) by mail86-db3 (MessageSwitch) id 1310101545503134_5040; Fri, 8 Jul 2011 05:05:45 +0000 (UTC) Received: from DB3EHSMHS019.bigfish.com (unknown [10.3.81.247]) by mail86-db3.bigfish.com (Postfix) with ESMTP id 75A0B170804F; Fri, 8 Jul 2011 05:05:45 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB3EHSMHS019.bigfish.com (10.3.87.119) with Microsoft SMTP Server (TLS) id 14.1.225.22; Fri, 8 Jul 2011 05:05:45 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.289.8; Fri, 8 Jul 2011 00:05:44 -0500 Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id p6855ZGR029519; Fri, 8 Jul 2011 00:05:42 -0500 (CDT) From: Huang Shijie To: Subject: [PATCH v6 2/4] ARM: mxs: add new a pad control Date: Fri, 8 Jul 2011 13:28:03 +0800 Message-ID: <1310102885-4102-3-git-send-email-b32955@freescale.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1310102885-4102-1-git-send-email-b32955@freescale.com> References: <1310102885-4102-1-git-send-email-b32955@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110708_010548_784409_239BA9BA X-CRM114-Status: GOOD ( 12.74 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [213.199.154.142 listed in list.dnswl.org] Cc: arnd@arndb.de, w.sang@pengutronix.de, Huang Shijie , linux-mtd@lists.infradead.org, u.kleine-koenig@pengutronix.de, linux-arm-kernel@lists.infradead.org, LW@karo-electronics.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org add a new pad control which is used in some rare cases, such as gpmi-nand device. Signed-off-by: Huang Shijie --- arch/arm/mach-mxs/include/mach/iomux.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-mxs/include/mach/iomux.h b/arch/arm/mach-mxs/include/mach/iomux.h index 7abdf58..1f31762 100644 --- a/arch/arm/mach-mxs/include/mach/iomux.h +++ b/arch/arm/mach-mxs/include/mach/iomux.h @@ -94,6 +94,9 @@ typedef u32 iomux_cfg_t; /* generic pad control used in most cases */ #define MXS_PAD_CTRL (MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL) +/* special pad control used in rare cases */ +#define MXS_PAD_CTRL_12MA (MXS_PAD_12MA | MXS_PAD_3V3 | MXS_PAD_NOPULL) + #define MXS_IOMUX_PAD(_bank, _pin, _muxsel, _ma, _vol, _pull) \ (((iomux_cfg_t)(_bank) << MXS_PAD_BANK_SHIFT) | \ ((iomux_cfg_t)(_pin) << MXS_PAD_PIN_SHIFT) | \