Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4929f5a8 authored by Haojian Zhuang's avatar Haojian Zhuang
Browse files

ARM: pxa: rename gpio_to_irq and irq_to_gpio 



Avoid to define gpio_to_irq() and irq_to_gpio() for potential name
confliction since multiple architecture will be built together.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
parent 87c49e20

arch/arm/mach-mmp/aspenite.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -120,8 +120,8 @@ static struct resource smc91x_resources[] = { 
		.flags	= IORESOURCE_MEM,

		.flags	= IORESOURCE_MEM,

	},

	},

	[1] = {

	[1] = {

		.start	= gpio_to_irq(27),

		.start	= MMP_GPIO_TO_IRQ(27),

		.end	= gpio_to_irq(27),

		.end	= MMP_GPIO_TO_IRQ(27),

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

	}

	}

};

};

arch/arm/mach-mmp/flint.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -87,8 +87,8 @@ static struct resource smc91x_resources[] = { 
		.flags  = IORESOURCE_MEM,

		.flags  = IORESOURCE_MEM,

	},

	},

	[1] = {

	[1] = {

		.start  = gpio_to_irq(155),

		.start  = MMP_GPIO_TO_IRQ(155),

		.end    = gpio_to_irq(155),

		.end    = MMP_GPIO_TO_IRQ(155),

		.flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

		.flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,

	}

	}

};

};

arch/arm/mach-mmp/include/mach/gpio-pxa.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define __ASM_MACH_GPIO_PXA_H

#define __ASM_MACH_GPIO_PXA_H





#include <mach/addr-map.h>

#include <mach/addr-map.h>

#include <mach/cputype.h>

#include <mach/irqs.h>

#include <mach/irqs.h>





#define GPIO_REGS_VIRT	(APB_VIRT_BASE + 0x19000)

#define GPIO_REGS_VIRT	(APB_VIRT_BASE + 0x19000)

arch/arm/mach-mmp/include/mach/gpio.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -3,9 +3,6 @@ 




#include <asm-generic/gpio.h>

#include <asm-generic/gpio.h>





#define gpio_to_irq(gpio)	(IRQ_GPIO_START + (gpio))

#define irq_to_gpio(irq)	((irq) - IRQ_GPIO_START)



#define __gpio_is_inverted(gpio)	(0)

#define __gpio_is_inverted(gpio)	(0)

#define __gpio_is_occupied(gpio)	(0)

#define __gpio_is_occupied(gpio)	(0)

arch/arm/mach-mmp/include/mach/irqs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,7 @@ 
#define IRQ_GPIO_START			128

#define IRQ_GPIO_START			128

#define IRQ_GPIO_NUM			192

#define IRQ_GPIO_NUM			192

#define IRQ_GPIO(x)			(IRQ_GPIO_START + (x))

#define IRQ_GPIO(x)			(IRQ_GPIO_START + (x))

#define MMP_GPIO_TO_IRQ(gpio)		(IRQ_GPIO_START + (gpio))





#define IRQ_BOARD_START			(IRQ_GPIO_START + IRQ_GPIO_NUM)

#define IRQ_BOARD_START			(IRQ_GPIO_START + IRQ_GPIO_NUM)