ARM: pxa: rename gpio_to_irq and irq_to_gpio

[mv-sheeva.git] / arch / arm / mach-pxa / viper.c

diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index 242ddae332d30b6dd34a8107d3315f6f03e188c0..d9a653a7717635afb91688ccaa5c0dd8425c8c70 100644 (file)
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -422,8 +422,8 @@ static struct resource smc91x_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
-               .start  = gpio_to_irq(VIPER_ETH_GPIO),
-               .end    = gpio_to_irq(VIPER_ETH_GPIO),
+               .start  = PXA_GPIO_TO_IRQ(VIPER_ETH_GPIO),
+               .end    = PXA_GPIO_TO_IRQ(VIPER_ETH_GPIO),
                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
        },
        [2] = {
@@ -546,7 +546,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
        /* External UARTs */
        {
                .mapbase        = VIPER_UARTA_PHYS,
-               .irq            = gpio_to_irq(VIPER_UARTA_GPIO),
+               .irq            = PXA_GPIO_TO_IRQ(VIPER_UARTA_GPIO),
                .irqflags       = IRQF_TRIGGER_RISING,
                .uartclk        = 1843200,
                .regshift       = 1,
@@ -556,7 +556,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
        },
        {
                .mapbase        = VIPER_UARTB_PHYS,
-               .irq            = gpio_to_irq(VIPER_UARTB_GPIO),
+               .irq            = PXA_GPIO_TO_IRQ(VIPER_UARTB_GPIO),
                .irqflags       = IRQF_TRIGGER_RISING,
                .uartclk        = 1843200,
                .regshift       = 1,
@@ -596,8 +596,8 @@ static struct resource isp116x_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        [2] = {
-               .start  = gpio_to_irq(VIPER_USB_GPIO),
-               .end    = gpio_to_irq(VIPER_USB_GPIO),
+               .start  = PXA_GPIO_TO_IRQ(VIPER_USB_GPIO),
+               .end    = PXA_GPIO_TO_IRQ(VIPER_USB_GPIO),
                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
        },
 };