From patchwork Fri Nov 18 07:11:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Hui X-Patchwork-Id: 5200 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 518B723FFE for ; Fri, 18 Nov 2011 07:03:13 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 2CCBCA181F1 for ; Fri, 18 Nov 2011 07:03:13 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id a26so7110159faa.11 for ; Thu, 17 Nov 2011 23:03:13 -0800 (PST) Received: by 10.152.105.226 with SMTP id gp2mr1109887lab.28.1321599792982; Thu, 17 Nov 2011 23:03:12 -0800 (PST) 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.152.41.198 with SMTP id h6cs169099lal; Thu, 17 Nov 2011 23:03:12 -0800 (PST) Received: by 10.68.9.2 with SMTP id v2mr6675843pba.101.1321599789841; Thu, 17 Nov 2011 23:03:09 -0800 (PST) Received: from VA3EHSOBE005.bigfish.com (va3ehsobe005.messaging.microsoft.com. [216.32.180.31]) by mx.google.com with ESMTPS id d4si5763165pbq.95.2011.11.17.23.03.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 17 Nov 2011 23:03:09 -0800 (PST) Received-SPF: neutral (google.com: 216.32.180.31 is neither permitted nor denied by best guess record for domain of jason.hui@linaro.org) client-ip=216.32.180.31; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.180.31 is neither permitted nor denied by best guess record for domain of jason.hui@linaro.org) smtp.mail=jason.hui@linaro.org Received: from mail6-va3-R.bigfish.com (10.7.14.242) by VA3EHSOBE005.bigfish.com (10.7.40.25) with Microsoft SMTP Server id 14.1.225.22; Fri, 18 Nov 2011 07:02:33 +0000 Received: from mail6-va3 (localhost [127.0.0.1]) by mail6-va3-R.bigfish.com (Postfix) with ESMTP id A8A414C04EF; Fri, 18 Nov 2011 07:06:33 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dh87h2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail6-va3 (localhost.localdomain [127.0.0.1]) by mail6-va3 (MessageSwitch) id 1321599993166731_25843; Fri, 18 Nov 2011 07:06:33 +0000 (UTC) Received: from VA3EHSMHS029.bigfish.com (unknown [10.7.14.235]) by mail6-va3.bigfish.com (Postfix) with ESMTP id 19B346E0046; Fri, 18 Nov 2011 07:06:33 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS029.bigfish.com (10.7.99.39) with Microsoft SMTP Server (TLS) id 14.1.225.22; Fri, 18 Nov 2011 07:02:33 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.339.2; Fri, 18 Nov 2011 01:03:06 -0600 Received: from r64343-desktop.ap.freescale.net (r64343-desktop.ap.freescale.net [10.192.242.36]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id pAI72vbX002190; Fri, 18 Nov 2011 01:03:04 -0600 (CST) From: Jason Liu To: CC: Subject: [U-Boot][PATCH V2 3/6] i.mx: mxc_gpio: add the i.mx6q support Date: Fri, 18 Nov 2011 15:11:04 +0800 Message-ID: <1321600267-8514-4-git-send-email-jason.hui@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1321600267-8514-1-git-send-email-jason.hui@linaro.org> References: <1321600267-8514-1-git-send-email-jason.hui@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com Signed-off-by: Jason Liu Cc: Stefano Babic Acked-by: Stefano Babic --- V2: add Stefano's ack --- drivers/gpio/mxc_gpio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index a7f36b2..908808d 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -40,10 +40,10 @@ static unsigned long gpio_ports[] = { [0] = GPIO1_BASE_ADDR, [1] = GPIO2_BASE_ADDR, [2] = GPIO3_BASE_ADDR, -#if defined(CONFIG_MX51) || defined(CONFIG_MX53) +#if defined(CONFIG_MX51) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q) [3] = GPIO4_BASE_ADDR, #endif -#if defined(CONFIG_MX53) +#if defined(CONFIG_MX53) || defined(CONFIG_MX6Q) [4] = GPIO5_BASE_ADDR, [5] = GPIO6_BASE_ADDR, [6] = GPIO7_BASE_ADDR,