diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-16 12:03:05 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-30 03:00:43 -0400 |
commit | 4a9b8b0b061ef750b5ef31d1e9d2fa0206731f2f (patch) | |
tree | d6128f7116c4cefdb801897c6febe5e1297a1228 /arch/arm/mach-mx3/mach-armadillo5x0.c | |
parent | c69871597dd173af2d7615429c0ee6aa10fae42b (diff) |
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-armadillo5x0.c')
-rw-r--r-- | arch/arm/mach-mx3/mach-armadillo5x0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mach-armadillo5x0.c b/arch/arm/mach-mx3/mach-armadillo5x0.c index 633107a69acd..423ffe774ead 100644 --- a/arch/arm/mach-mx3/mach-armadillo5x0.c +++ b/arch/arm/mach-mx3/mach-armadillo5x0.c | |||
@@ -499,7 +499,6 @@ static struct imxuart_platform_data uart_pdata = { | |||
499 | 499 | ||
500 | static struct platform_device *devices[] __initdata = { | 500 | static struct platform_device *devices[] __initdata = { |
501 | &armadillo5x0_smc911x_device, | 501 | &armadillo5x0_smc911x_device, |
502 | &mxc_i2c_device1, | ||
503 | &armadillo5x0_button_device, | 502 | &armadillo5x0_button_device, |
504 | }; | 503 | }; |
505 | 504 | ||
@@ -512,6 +511,7 @@ static void __init armadillo5x0_init(void) | |||
512 | ARRAY_SIZE(armadillo5x0_pins), "armadillo5x0"); | 511 | ARRAY_SIZE(armadillo5x0_pins), "armadillo5x0"); |
513 | 512 | ||
514 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 513 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
514 | imx31_add_imx_i2c1(NULL); | ||
515 | 515 | ||
516 | /* Register UART */ | 516 | /* Register UART */ |
517 | mxc_register_device(&mxc_uart_device0, &uart_pdata); | 517 | mxc_register_device(&mxc_uart_device0, &uart_pdata); |