diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-16 17:25:40 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 09:00:41 +0200 |
| commit | c69871597dd173af2d7615429c0ee6aa10fae42b (patch) | |
| tree | 3747d63224d52637489b268c39f7a6346899bc4c /arch/arm/mach-imx/mach-pcm038.c | |
| parent | a8ff045603c712d6d61e07260ec2c0e44c40d14c (diff) | |
| download | kernel_samsung_smdk4412-c69871597dd173af2d7615429c0ee6aa10fae42b.zip kernel_samsung_smdk4412-c69871597dd173af2d7615429c0ee6aa10fae42b.tar.gz kernel_samsung_smdk4412-c69871597dd173af2d7615429c0ee6aa10fae42b.tar.bz2 | |
ARM: imx: dynamically register imx-i2c devices (imx27)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-pcm038.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index bc44d6f..7559e0f 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c @@ -35,7 +35,6 @@ #include <mach/board-pcm038.h> #include <mach/common.h> #include <mach/hardware.h> -#include <mach/i2c.h> #include <mach/iomux-mx27.h> #include <mach/imx-uart.h> #include <mach/mxc_nand.h> @@ -194,7 +193,7 @@ static void __init pcm038_init_sram(void) mx27_setup_weimcs(1, 0x0000d843, 0x22252521, 0x22220a00); } -static struct imxi2c_platform_data pcm038_i2c_1_data = { +static const struct imxi2c_platform_data pcm038_i2c1_data __initconst = { .bitrate = 100000, }; @@ -318,7 +317,7 @@ static void __init pcm038_init(void) i2c_register_board_info(1, pcm038_i2c_devices, ARRAY_SIZE(pcm038_i2c_devices)); - mxc_register_device(&mxc_i2c_device1, &pcm038_i2c_1_data); + imx27_add_i2c_imx1(&pcm038_i2c1_data); /* PE18 for user-LED D40 */ mxc_gpio_mode(GPIO_PORTE | 18 | GPIO_GPIO | GPIO_OUT); |