From patchwork Sat Aug 13 16:14:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 3437 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 EBF2324198 for ; Sat, 13 Aug 2011 16:00:43 +0000 (UTC) Received: from mail-ew0-f52.google.com (mail-ew0-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id E1E30A18365 for ; Sat, 13 Aug 2011 16:00:43 +0000 (UTC) Received: by ewy28 with SMTP id 28so2167074ewy.11 for ; Sat, 13 Aug 2011 09:00:43 -0700 (PDT) Received: by 10.213.3.155 with SMTP id 27mr140500ebn.18.1313251243570; Sat, 13 Aug 2011 09:00:43 -0700 (PDT) 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.213.102.5 with SMTP id e5cs22909ebo; Sat, 13 Aug 2011 09:00:43 -0700 (PDT) Received: from mr.google.com ([10.42.162.1]) by 10.42.162.1 with SMTP id v1mr2444388icx.381.1313251243291 (num_hops = 1); Sat, 13 Aug 2011 09:00:43 -0700 (PDT) Received: by 10.42.162.1 with SMTP id v1mr2024249icx.381.1313251242618; Sat, 13 Aug 2011 09:00:42 -0700 (PDT) Received: from mail-iy0-f170.google.com (mail-iy0-f170.google.com [209.85.210.170]) by mx.google.com with ESMTPS id md8si11039975icb.153.2011.08.13.09.00.42 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 13 Aug 2011 09:00:42 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.210.170 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.210.170; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.210.170 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by mail-iy0-f170.google.com with SMTP id 16so3848137iye.1 for ; Sat, 13 Aug 2011 09:00:42 -0700 (PDT) Received: by 10.42.161.68 with SMTP id s4mr1967935icx.261.1313251242171; Sat, 13 Aug 2011 09:00:42 -0700 (PDT) Received: from localhost.localdomain ([114.216.156.140]) by mx.google.com with ESMTPS id bv10sm1351925icb.1.2011.08.13.09.00.35 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 13 Aug 2011 09:00:41 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Cc: Russell King - ARM Linux , Grant Likely , Sascha Hauer , Nicolas Pitre , patches@linaro.org, Ben Dooks Subject: [PATCH v2 1/8] ARM: mx5: board-cpuimx51.c fixup irq_to_gpio() usage Date: Sun, 14 Aug 2011 00:14:00 +0800 Message-Id: <1313252047-8820-2-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1313252047-8820-1-git-send-email-shawn.guo@linaro.org> References: <1313252047-8820-1-git-send-email-shawn.guo@linaro.org> From: Ben Dooks irq_to_gpio() is being called on a GPIO so change to using gpio_to_irq() instead. Signed-off-by: Ben Dooks Signed-off-by: Sascha Hauer --- arch/arm/mach-mx5/board-cpuimx51.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-mx5/board-cpuimx51.c b/arch/arm/mach-mx5/board-cpuimx51.c index 7c893fa..68934ea 100644 --- a/arch/arm/mach-mx5/board-cpuimx51.c +++ b/arch/arm/mach-mx5/board-cpuimx51.c @@ -81,7 +81,7 @@ static struct plat_serial8250_port serial_platform_data[] = { .flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP, }, { .mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x2000000), - .irq = irq_to_gpio(CPUIMX51_QUARTD_GPIO), + .irq = gpio_to_irq(CPUIMX51_QUARTD_GPIO), .irqflags = IRQF_TRIGGER_HIGH, .uartclk = CPUIMX51_QUART_XTAL, .regshift = CPUIMX51_QUART_REGSHIFT,