diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-16 18:03:05 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 09:00:43 +0200 |
| commit | 4a9b8b0b061ef750b5ef31d1e9d2fa0206731f2f (patch) | |
| tree | d6128f7116c4cefdb801897c6febe5e1297a1228 /arch/arm/mach-mx3/mach-pcm037.c | |
| parent | c69871597dd173af2d7615429c0ee6aa10fae42b (diff) | |
| download | linux-0-day-4a9b8b0b061ef750b5ef31d1e9d2fa0206731f2f.tar.gz linux-0-day-4a9b8b0b061ef750b5ef31d1e9d2fa0206731f2f.tar.xz | |
ARM: imx: dynamically register imx-i2c devices (imx31)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm037.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm037.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c index d7fef469990a9..7e3fc470d55d8 100644 --- a/arch/arm/mach-mx3/mach-pcm037.c +++ b/arch/arm/mach-mx3/mach-pcm037.c @@ -41,7 +41,6 @@ #include <asm/mach/map.h> #include <mach/common.h> #include <mach/hardware.h> -#include <mach/i2c.h> #include <mach/imx-uart.h> #include <mach/iomux-mx3.h> #include <mach/ipu.h> @@ -280,11 +279,11 @@ pcm037_nand_board_info __initconst = { .hw_ecc = 1, }; -static struct imxi2c_platform_data pcm037_i2c_1_data = { +static const struct imxi2c_platform_data pcm037_i2c1_data __initconst = { .bitrate = 100000, }; -static struct imxi2c_platform_data pcm037_i2c_2_data = { +static const struct imxi2c_platform_data pcm037_i2c2_data __initconst = { .bitrate = 20000, }; @@ -630,8 +629,8 @@ static void __init mxc_board_init(void) i2c_register_board_info(1, pcm037_i2c_devices, ARRAY_SIZE(pcm037_i2c_devices)); - mxc_register_device(&mxc_i2c_device1, &pcm037_i2c_1_data); - mxc_register_device(&mxc_i2c_device2, &pcm037_i2c_2_data); + imx31_add_imx_i2c1(&pcm037_i2c1_data); + imx31_add_imx_i2c2(&pcm037_i2c2_data); imx31_add_mxc_nand(&pcm037_nand_board_info); mxc_register_device(&mxcsdhc_device0, &sdhc_pdata); |