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

Commit 6f584cfa authored by Eric Miao's avatar Eric Miao
Browse files

[ARM] pxa: move I2C pin configurations out into board specific files 



Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent 14758220

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

+4 −0
Original line number Diff line number Diff line
@@ -136,6 +136,10 @@ static mfp_cfg_t cm_x300_mfp_cfg[] __initdata = { 
	GPIO82_GPIO | MFP_PULL_HIGH,	/* MMC CD */

	GPIO85_GPIO,			/* MMC WP */

	GPIO99_GPIO,			/* Ethernet IRQ */



	/* Standard I2C */

	GPIO21_I2C_SCL,

	GPIO22_I2C_SDA,

};



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

arch/arm/mach-pxa/devices.c

+0 −8
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <mach/mmc.h>

#include <mach/irda.h>

#include <mach/i2c.h>

#include <mach/mfp-pxa27x.h>

#include <mach/ohci.h>

#include <mach/pxa27x_keypad.h>

#include <mach/pxa2xx_spi.h>
@@ -249,15 +248,8 @@ struct platform_device pxa_device_i2c = { 
	.num_resources	= ARRAY_SIZE(pxai2c_resources),

};



static unsigned long pxa27x_i2c_mfp_cfg[] = {

	GPIO117_I2C_SCL,

	GPIO118_I2C_SDA,

};



void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)

{

	if (cpu_is_pxa27x())

		pxa2xx_mfp_config(ARRAY_AND_SIZE(pxa27x_i2c_mfp_cfg));

	pxa_register_device(&pxa_device_i2c, info);

}

arch/arm/mach-pxa/ezx.c

+4 −0
Original line number Diff line number Diff line
@@ -112,6 +112,10 @@ static unsigned long ezx_pin_config[] __initdata = { 
	GPIO91_USB_P3_1,	/* ICL_XRXD */

	GPIO56_USB_P3_4,	/* ICL_VMOUT */

	GPIO113_USB_P3_3,	/* /ICL_VMIN */



	/* I2C */

	GPIO117_I2C_SCL,

	GPIO118_I2C_SDA,

};



static void __init ezx_init(void)

arch/arm/mach-pxa/magician.c

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,10 @@ static unsigned long magician_pin_config[] __initdata = { 
	GPIO107_GPIO,	/* DS1WM_IRQ */

	GPIO108_GPIO,	/* GSM_READY */

	GPIO115_GPIO,	/* nPEN_IRQ */



	/* I2C */

	GPIO117_I2C_SCL,

	GPIO118_I2C_SDA,

};



/*

arch/arm/mach-pxa/mainstone.c

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,10 @@ static unsigned long mainstone_pin_config[] = { 
	GPIO108_KP_MKOUT_5,

	GPIO96_KP_MKOUT_6,



	/* I2C */

	GPIO117_I2C_SCL,

	GPIO118_I2C_SDA,



	/* GPIO */

	GPIO1_GPIO | WAKEUP_ON_EDGE_BOTH,

};