diff options
| author | Uwe Kleine-König | 2010-06-16 19:25:34 +0200 |
|---|---|---|
| committer | Uwe Kleine-König | 2010-06-30 09:00:44 +0200 |
| commit | 7cdc8fa7120f97f40d36547854ae127dc0318e3a (patch) | |
| tree | 54d2b57a0f0f14063fa995b99c7a64de9d473dc1 /arch/arm/mach-mx3/mach-pcm043.c | |
| parent | ARM: imx: dynamically register imx-i2c devices (imx31) (diff) | |
| download | kernel-qcow2-linux-7cdc8fa7120f97f40d36547854ae127dc0318e3a.tar.gz kernel-qcow2-linux-7cdc8fa7120f97f40d36547854ae127dc0318e3a.tar.xz kernel-qcow2-linux-7cdc8fa7120f97f40d36547854ae127dc0318e3a.zip | |
ARM: imx: dynamically register imx-i2c devices (imx35)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm043.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm043.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c index 58de3055b85e..21305c67afcf 100644 --- a/arch/arm/mach-mx3/mach-pcm043.c +++ b/arch/arm/mach-mx3/mach-pcm043.c @@ -37,9 +37,6 @@ #include <mach/hardware.h> #include <mach/common.h> #include <mach/imx-uart.h> -#if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE -#include <mach/i2c.h> -#endif #include <mach/iomux-mx35.h> #include <mach/ipu.h> #include <mach/mx3fb.h> @@ -123,7 +120,7 @@ static struct imxuart_platform_data uart_pdata = { }; #if defined CONFIG_I2C_IMX || defined CONFIG_I2C_IMX_MODULE -static struct imxi2c_platform_data pcm043_i2c_1_data = { +static const struct imxi2c_platform_data pcm043_i2c0_data __initconst = { .bitrate = 50000, }; @@ -368,7 +365,7 @@ static void __init mxc_board_init(void) i2c_register_board_info(0, pcm043_i2c_devices, ARRAY_SIZE(pcm043_i2c_devices)); - mxc_register_device(&mxc_i2c_device0, &pcm043_i2c_1_data); + imx35_add_imx_i2c0(&pcm043_i2c0_data); #endif mxc_register_device(&mx3_ipu, &mx3_ipu_data); |