From patchwork Fri Nov 25 10:18:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Hui X-Patchwork-Id: 5313 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 650ED23E03 for ; Fri, 25 Nov 2011 10:09:55 +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 536E3A18234 for ; Fri, 25 Nov 2011 10:09:55 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id a26so4349277faa.11 for ; Fri, 25 Nov 2011 02:09:55 -0800 (PST) Received: by 10.152.104.1 with SMTP id ga1mr19625083lab.40.1322215795181; Fri, 25 Nov 2011 02:09:55 -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 h6cs333768lal; Fri, 25 Nov 2011 02:09:54 -0800 (PST) Received: by 10.52.35.75 with SMTP id f11mr33395616vdj.18.1322215792427; Fri, 25 Nov 2011 02:09:52 -0800 (PST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe004.messaging.microsoft.com. [216.32.181.184]) by mx.google.com with ESMTPS id b6si17904919vdw.62.2011.11.25.02.09.51 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Nov 2011 02:09:52 -0800 (PST) Received-SPF: neutral (google.com: 216.32.181.184 is neither permitted nor denied by best guess record for domain of jason.hui@linaro.org) client-ip=216.32.181.184; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.181.184 is neither permitted nor denied by best guess record for domain of jason.hui@linaro.org) smtp.mail=jason.hui@linaro.org Received: from mail110-ch1-R.bigfish.com (10.43.68.250) by CH1EHSOBE010.bigfish.com (10.43.70.60) with Microsoft SMTP Server id 14.1.225.22; Fri, 25 Nov 2011 10:09:08 +0000 Received: from mail110-ch1 (localhost [127.0.0.1]) by mail110-ch1-R.bigfish.com (Postfix) with ESMTP id 405FE4404D8; Fri, 25 Nov 2011 10:09:51 +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-SS: 13, X-FB-DOMAIN-IP-MATCH: fail Received: from mail110-ch1 (localhost.localdomain [127.0.0.1]) by mail110-ch1 (MessageSwitch) id 1322215790884943_8389; Fri, 25 Nov 2011 10:09:50 +0000 (UTC) Received: from CH1EHSMHS006.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.254]) by mail110-ch1.bigfish.com (Postfix) with ESMTP id D29AC6E021A; Fri, 25 Nov 2011 10:09:50 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS006.bigfish.com (10.43.70.6) with Microsoft SMTP Server (TLS) id 14.1.225.22; Fri, 25 Nov 2011 10:09:07 +0000 Received: from az33smr02.freescale.net (10.64.34.200) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.339.2; Fri, 25 Nov 2011 04:09:49 -0600 Received: from r64343-desktop.ap.freescale.net (r64343-desktop.ap.freescale.net [10.192.242.36]) by az33smr02.freescale.net (8.13.1/8.13.0) with ESMTP id pAPA9eGS013347; Fri, 25 Nov 2011 04:09:48 -0600 (CST) From: Jason Liu To: CC: Subject: [U-Boot][PATCH V3 3/5] i.mx: mxc_gpio: add the i.mx6q support Date: Fri, 25 Nov 2011 18:18:03 +0800 Message-ID: <1322216285-23479-4-git-send-email-jason.hui@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1322216285-23479-1-git-send-email-jason.hui@linaro.org> References: <1322216285-23479-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,