Patchwork ARM: mx5: board-cpuimx51.c fixup irq_to_gpio() usage

login
register
mail settings
Submitter Ben Dooks
Date Aug. 4, 2011, 3:47 p.m.
Message ID <1312472855-15778-1-git-send-email-ben-linux@fluff.org>
Download mbox | patch
Permalink /patch/108535/
State New
Headers show

Comments

Ben Dooks - Aug. 4, 2011, 3:47 p.m.
irq_to_gpio() is being called on a GPIO so change to using
gpio_to_irq() instead.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
 arch/arm/mach-mx5/board-cpuimx51.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Amit Kucheria - Aug. 4, 2011, 4:19 p.m.
On 11 Aug 04, Ben Dooks wrote:
> irq_to_gpio() is being called on a GPIO so change to using
> gpio_to_irq() instead.
> 
> Signed-off-by: Ben Dooks <ben-linux@fluff.org>

cc'ing board maintainer.

Acked-by: Amit Kucheria <amit.kucheria@canonical.com>


> ---
>  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,
> -- 
> 1.7.1
>
Sascha Hauer - Aug. 5, 2011, 7:04 a.m.
On Thu, Aug 04, 2011 at 04:47:35PM +0100, Ben Dooks wrote:
> irq_to_gpio() is being called on a GPIO so change to using
> gpio_to_irq() instead.
> 
> Signed-off-by: Ben Dooks <ben-linux@fluff.org>

Applied, thanks

Sascha

> ---
>  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,
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>

Patch

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,