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

Commit b8f649f1 authored by Haojian Zhuang's avatar Haojian Zhuang
Browse files

ARM: pxa: move PXA_GPIO_TO_IRQ macro 



Since PXA_GPIO_TO_IRQ() & MMP_GPIO_TO_IRQ() macro are depended on
arch code, move them from gpio driver to platform driver instead.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 2cab0292

arch/arm/mach-mmp/aspenite.c

+7 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 *  publishhed by the Free Software Foundation.

 */

#include <linux/gpio.h>

#include <linux/gpio-pxa.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>
@@ -110,6 +111,10 @@ static unsigned long common_pin_config[] __initdata = { 
	GPIO121_KP_MKIN4,

};



static struct pxa_gpio_platform_data pxa168_gpio_pdata = {

	.irq_base	= MMP_GPIO_TO_IRQ(0),

};



static struct smc91x_platdata smc91x_info = {

	.flags	= SMC91X_USE_16BIT | SMC91X_NOWAIT,

};
@@ -248,6 +253,8 @@ static void __init common_init(void) 
	pxa168_add_nand(&aspenite_nand_info);

	pxa168_add_fb(&aspenite_lcd_info);

	pxa168_add_keypad(&aspenite_keypad_info);

	platform_device_add_data(&pxa168_device_gpio, &pxa168_gpio_pdata,

				 sizeof(struct pxa_gpio_platform_data));

	platform_device_register(&pxa168_device_gpio);



	/* off-chip devices */

arch/arm/mach-mmp/avengers_lite.c

+7 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/init.h>

#include <linux/kernel.h>

#include <linux/gpio-pxa.h>

#include <linux/platform_device.h>



#include <asm/mach-types.h>
@@ -32,12 +33,18 @@ static unsigned long avengers_lite_pin_config_V16F[] __initdata = { 
	GPIO89_UART2_RXD,

};



static struct pxa_gpio_platform_data pxa168_gpio_pdata = {

	.irq_base	= MMP_GPIO_TO_IRQ(0),

};



static void __init avengers_lite_init(void)

{

	mfp_config(ARRAY_AND_SIZE(avengers_lite_pin_config_V16F));



	/* on-chip devices */

	pxa168_add_uart(2);

	platform_device_add_data(&pxa168_device_gpio, &pxa168_gpio_pdata,

				 sizeof(struct pxa_gpio_platform_data));

	platform_device_register(&pxa168_device_gpio);

}

arch/arm/mach-mmp/brownstone.c

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/kernel.h>

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/gpio-pxa.h>

#include <linux/regulator/machine.h>

#include <linux/regulator/max8649.h>

#include <linux/regulator/fixed.h>
@@ -104,6 +105,10 @@ static unsigned long brownstone_pin_config[] __initdata = { 
	GPIO89_GPIO,

};



static struct pxa_gpio_platform_data mmp2_gpio_pdata = {

	.irq_base	= MMP_GPIO_TO_IRQ(0),

};



static struct regulator_consumer_supply max8649_supply[] = {

	REGULATOR_SUPPLY("vcc_core", NULL),

};
@@ -202,6 +207,8 @@ static void __init brownstone_init(void) 
	/* on-chip devices */

	mmp2_add_uart(1);

	mmp2_add_uart(3);

	platform_device_add_data(&mmp2_device_gpio, &mmp2_gpio_pdata,

				 sizeof(struct pxa_gpio_platform_data));

	platform_device_register(&mmp2_device_gpio);

	mmp2_add_twsi(1, NULL, ARRAY_AND_SIZE(brownstone_twsi1_info));

	mmp2_add_sdhost(0, &mmp2_sdh_platdata_mmc0); /* SD/MMC */

arch/arm/mach-mmp/flint.c

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/smc91x.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <linux/gpio-pxa.h>

#include <linux/interrupt.h>



#include <asm/mach-types.h>
@@ -77,6 +78,10 @@ static unsigned long flint_pin_config[] __initdata = { 
	GPIO160_ND_RDY1,

};



static struct pxa_gpio_platform_data mmp2_gpio_pdata = {

	.irq_base	= MMP_GPIO_TO_IRQ(0),

};



static struct smc91x_platdata flint_smc91x_info = {

	.flags  = SMC91X_USE_16BIT | SMC91X_NOWAIT,

};
@@ -111,6 +116,8 @@ static void __init flint_init(void) 
	/* on-chip devices */

	mmp2_add_uart(1);

	mmp2_add_uart(2);

	platform_device_add_data(&mmp2_device_gpio, &mmp2_gpio_pdata,

				 sizeof(struct pxa_gpio_platform_data));

	platform_device_register(&mmp2_device_gpio);



	/* off-chip devices */

arch/arm/mach-mmp/gplugd.c

+7 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/gpio-pxa.h>



#include <asm/mach/arch.h>

#include <asm/mach-types.h>
@@ -128,6 +129,10 @@ static unsigned long gplugd_pin_config[] __initdata = { 
	GPIO116_I2S_TXD

};



static struct pxa_gpio_platform_data pxa168_gpio_pdata = {

	.irq_base	= MMP_GPIO_TO_IRQ(0),

};



static struct i2c_board_info gplugd_i2c_board_info[] = {

	{

		.type = "isl1208",
@@ -186,6 +191,8 @@ static void __init gplugd_init(void) 
	pxa168_add_uart(3);

	pxa168_add_ssp(1);

	pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(gplugd_i2c_board_info));

	platform_device_add_data(&pxa168_device_gpio, &pxa168_gpio_pdata,

				 sizeof(struct pxa_gpio_platform_data));

	platform_device_register(&pxa168_device_gpio);



	pxa168_add_eth(&gplugd_eth_platform_data);