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

Commit 6384fdad authored by Haojian Zhuang's avatar Haojian Zhuang
Browse files

ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 



Avoid potential naming confliction since multiple architecture will be built
in a single kernel.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 31555213

arch/arm/mach-pxa/am200epd.c

+2 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void am200_cleanup(struct metronomefb_par *par) 
{

	int i;



	free_irq(IRQ_GPIO(RDY_GPIO_PIN), par);

	free_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), par);



	for (i = 0; i < ARRAY_SIZE(gpios); i++)

		gpio_free(gpios[i]);
@@ -292,7 +292,7 @@ static int am200_setup_irq(struct fb_info *info) 
{

	int ret;



	ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am200_handle_irq,

	ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am200_handle_irq,

				IRQF_DISABLED|IRQF_TRIGGER_FALLING,

				"AM200", info->par);

	if (ret)

arch/arm/mach-pxa/am300epd.c

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static void am300_cleanup(struct broadsheetfb_par *par) 
{

	int i;



	free_irq(IRQ_GPIO(RDY_GPIO_PIN), par);

	free_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), par);



	for (i = 0; i < ARRAY_SIZE(gpios); i++)

		gpio_free(gpios[i]);
@@ -240,7 +240,7 @@ static int am300_setup_irq(struct fb_info *info) 
	int ret;

	struct broadsheetfb_par *par = info->par;



	ret = request_irq(IRQ_GPIO(RDY_GPIO_PIN), am300_handle_irq,

	ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am300_handle_irq,

				IRQF_DISABLED|IRQF_TRIGGER_RISING,

				"AM300", par);

	if (ret)

arch/arm/mach-pxa/balloon3.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static unsigned long balloon3_ac97_pin_config[] __initdata = { 
};



static struct ucb1400_pdata vpac270_ucb1400_pdata = {

	.irq		= IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ),

	.irq		= PXA_GPIO_TO_IRQ(BALLOON3_GPIO_CODEC_IRQ),

};

arch/arm/mach-pxa/cm-x270.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
/* GPIO IRQ usage */

#define GPIO83_MMC_IRQ		(83)



#define CMX270_MMC_IRQ		IRQ_GPIO(GPIO83_MMC_IRQ)

#define CMX270_MMC_IRQ		PXA_GPIO_TO_IRQ(GPIO83_MMC_IRQ)



/* MMC power enable */

#define GPIO105_MMC_POWER	(105)

arch/arm/mach-pxa/cm-x2xx.c

+2 −2
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ extern void cmx270_init(void); 
#define CMX255_GPIO_IT8152_IRQ	(0)

#define CMX270_GPIO_IT8152_IRQ	(22)



#define CMX255_ETHIRQ		IRQ_GPIO(GPIO22_ETHIRQ)

#define CMX270_ETHIRQ		IRQ_GPIO(GPIO10_ETHIRQ)

#define CMX255_ETHIRQ		PXA_GPIO_TO_IRQ(GPIO22_ETHIRQ)

#define CMX270_ETHIRQ		PXA_GPIO_TO_IRQ(GPIO10_ETHIRQ)



#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)

static struct resource cmx255_dm9000_resource[] = {