diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-16 11:25:40 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 03:00:41 -0400 |
commit | c69871597dd173af2d7615429c0ee6aa10fae42b (patch) | |
tree | 3747d63224d52637489b268c39f7a6346899bc4c /arch/arm/mach-imx/mach-mx27ads.c | |
parent | a8ff045603c712d6d61e07260ec2c0e44c40d14c (diff) |
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-mx27ads.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx27ads.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c index 1a3ebf5dab26..f1ee335ad241 100644 --- a/arch/arm/mach-imx/mach-mx27ads.c +++ b/arch/arm/mach-imx/mach-mx27ads.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <mach/imx-uart.h> | 31 | #include <mach/imx-uart.h> |
32 | #include <mach/iomux-mx27.h> | 32 | #include <mach/iomux-mx27.h> |
33 | #include <mach/mxc_nand.h> | 33 | #include <mach/mxc_nand.h> |
34 | #include <mach/i2c.h> | ||
35 | #include <mach/imxfb.h> | 34 | #include <mach/imxfb.h> |
36 | #include <mach/mmc.h> | 35 | #include <mach/mmc.h> |
37 | 36 | ||
@@ -195,7 +194,7 @@ static struct platform_device mx27ads_nor_mtd_device = { | |||
195 | .resource = &mx27ads_flash_resource, | 194 | .resource = &mx27ads_flash_resource, |
196 | }; | 195 | }; |
197 | 196 | ||
198 | static struct imxi2c_platform_data mx27ads_i2c_data = { | 197 | static const struct imxi2c_platform_data mx27ads_i2c1_data __initconst = { |
199 | .bitrate = 100000, | 198 | .bitrate = 100000, |
200 | }; | 199 | }; |
201 | 200 | ||
@@ -322,7 +321,7 @@ static void __init mx27ads_board_init(void) | |||
322 | /* only the i2c master 1 is used on this CPU card */ | 321 | /* only the i2c master 1 is used on this CPU card */ |
323 | i2c_register_board_info(1, mx27ads_i2c_devices, | 322 | i2c_register_board_info(1, mx27ads_i2c_devices, |
324 | ARRAY_SIZE(mx27ads_i2c_devices)); | 323 | ARRAY_SIZE(mx27ads_i2c_devices)); |
325 | mxc_register_device(&mxc_i2c_device1, &mx27ads_i2c_data); | 324 | imx27_add_i2c_imx1(&mx27ads_i2c1_data); |
326 | mxc_register_device(&mxc_fb_device, &mx27ads_fb_data); | 325 | mxc_register_device(&mxc_fb_device, &mx27ads_fb_data); |
327 | mxc_register_device(&mxc_sdhc_device0, &sdhc1_pdata); | 326 | mxc_register_device(&mxc_sdhc_device0, &sdhc1_pdata); |
328 | mxc_register_device(&mxc_sdhc_device1, &sdhc2_pdata); | 327 | mxc_register_device(&mxc_sdhc_device1, &sdhc2_pdata); |