aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-pcm038.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-16 11:25:40 -0400
committerUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-06-30 03:00:41 -0400
commitc69871597dd173af2d7615429c0ee6aa10fae42b (patch)
tree3747d63224d52637489b268c39f7a6346899bc4c /arch/arm/mach-imx/mach-pcm038.c
parenta8ff045603c712d6d61e07260ec2c0e44c40d14c (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-pcm038.c')
-rw-r--r--arch/arm/mach-imx/mach-pcm038.c5
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 bc44d6faf47d..7559e0f7527d 100644
--- a/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
@@ -35,7 +35,6 @@
35#include <mach/board-pcm038.h> 35#include <mach/board-pcm038.h>
36#include <mach/common.h> 36#include <mach/common.h>
37#include <mach/hardware.h> 37#include <mach/hardware.h>
38#include <mach/i2c.h>
39#include <mach/iomux-mx27.h> 38#include <mach/iomux-mx27.h>
40#include <mach/imx-uart.h> 39#include <mach/imx-uart.h>
41#include <mach/mxc_nand.h> 40#include <mach/mxc_nand.h>
@@ -194,7 +193,7 @@ static void __init pcm038_init_sram(void)
194 mx27_setup_weimcs(1, 0x0000d843, 0x22252521, 0x22220a00); 193 mx27_setup_weimcs(1, 0x0000d843, 0x22252521, 0x22220a00);
195} 194}
196 195
197static struct imxi2c_platform_data pcm038_i2c_1_data = { 196static const struct imxi2c_platform_data pcm038_i2c1_data __initconst = {
198 .bitrate = 100000, 197 .bitrate = 100000,
199}; 198};
200 199
@@ -318,7 +317,7 @@ static void __init pcm038_init(void)
318 i2c_register_board_info(1, pcm038_i2c_devices, 317 i2c_register_board_info(1, pcm038_i2c_devices,
319 ARRAY_SIZE(pcm038_i2c_devices)); 318 ARRAY_SIZE(pcm038_i2c_devices));
320 319
321 mxc_register_device(&mxc_i2c_device1, &pcm038_i2c_1_data); 320 imx27_add_i2c_imx1(&pcm038_i2c1_data);
322 321
323 /* PE18 for user-LED D40 */ 322 /* PE18 for user-LED D40 */
324 mxc_gpio_mode(GPIO_PORTE | 18 | GPIO_GPIO | GPIO_OUT); 323 mxc_gpio_mode(GPIO_PORTE | 18 | GPIO_GPIO | GPIO_OUT);