[ARM] pxa: move I2C pin configurations out into board specific files
authorEric Miao <eric.miao@marvell.com>
Fri, 28 Nov 2008 08:00:24 +0000 (16:00 +0800)
committerEric Miao <eric.miao@marvell.com>
Tue, 2 Dec 2008 06:42:40 +0000 (14:42 +0800)
Signed-off-by: Eric Miao <eric.miao@marvell.com>
arch/arm/mach-pxa/cm-x300.c
arch/arm/mach-pxa/devices.c
arch/arm/mach-pxa/ezx.c
arch/arm/mach-pxa/magician.c
arch/arm/mach-pxa/mainstone.c
arch/arm/mach-pxa/pcm990-baseboard.c
arch/arm/mach-pxa/spitz.c

index 36a789ce803752bed5a8d0763bf2f12ce292ba1a..ff0c577cd1ac6213ffdc474acb0803d581744693 100644 (file)
@@ -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)
index 55699a216f937a0177a545a1c7349157d346ce69..88c362651445c7bf4259fd251f9a9f3b748cd9fa 100644 (file)
@@ -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);
 }
 
index cc3d850cc0b6bc961cd42c6a46f09e476efdcaee..a3084125aee729adadcde02f38a5f493bb788256 100644 (file)
@@ -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)
index 519138bc5f85ee6cff05318749f9a0437e79aa22..bf59cec27deff00a712bec60d699513f5a692e03 100644 (file)
@@ -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,
 };
 
 /*
index f2c7ad8f2b6b1fff6643a0f874f9169fb703fe09..5f224968043c76f101bf63621bb1d4a421f09a12 100644 (file)
@@ -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,
 };
index f601425f1b1eaa31b3307c4fea3e36785f920244..1e7515452285214b56ba0c9354cc153346a7fc3b 100644 (file)
@@ -55,6 +55,10 @@ static unsigned long pcm990_pin_config[] __initdata = {
        GPIO89_USBH1_PEN,
        /* PWM0 */
        GPIO16_PWM0_OUT,
+
+       /* I2C */
+       GPIO117_I2C_SCL,
+       GPIO118_I2C_SDA,
 };
 
 /*
index 3be76ee2bdbfd759b83eee07151ba7cf7917cc42..ebfb146f221470d8c08a902fce16a380b887a0b3 100644 (file)
@@ -122,6 +122,10 @@ static unsigned long spitz_pin_config[] __initdata = {
        GPIO105_GPIO,   /* SPITZ_GPIO_CF_IRQ */
        GPIO106_GPIO,   /* SPITZ_GPIO_CF2_IRQ */
 
+       /* I2C */
+       GPIO117_I2C_SCL,
+       GPIO118_I2C_SDA,
+
        GPIO1_GPIO | WAKEUP_ON_EDGE_RISE,
 };