diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-04 05:09:10 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-17 04:01:25 -0500 |
commit | e0a1961df8ad898b661cf0adcf3519254f135a44 (patch) | |
tree | bc663100b851b8cf06157fa6a967393bef39a8a9 /arch/arm/mach-imx/mach-pca100.c | |
parent | b2997cb12b302ee6d233808e32214d00afdcf128 (diff) |
ARM: imx: dynamically allocate imx2-wdt devices
Currently there is no platform data used in the driver. In case this
changes and for consistency NULL is passed unused to the soc specific
functions.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-pca100.c')
-rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 39c580bc9225..11da9c226e90 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c | |||
@@ -171,10 +171,6 @@ pca100_nand_board_info __initconst = { | |||
171 | .hw_ecc = 1, | 171 | .hw_ecc = 1, |
172 | }; | 172 | }; |
173 | 173 | ||
174 | static struct platform_device *platform_devices[] __initdata = { | ||
175 | &mxc_wdt, | ||
176 | }; | ||
177 | |||
178 | static const struct imxi2c_platform_data pca100_i2c1_data __initconst = { | 174 | static const struct imxi2c_platform_data pca100_i2c1_data __initconst = { |
179 | .bitrate = 100000, | 175 | .bitrate = 100000, |
180 | }; | 176 | }; |
@@ -432,7 +428,7 @@ static void __init pca100_init(void) | |||
432 | mxc_register_device(&mxc_fb_device, &pca100_fb_data); | 428 | mxc_register_device(&mxc_fb_device, &pca100_fb_data); |
433 | 429 | ||
434 | imx27_add_fec(NULL); | 430 | imx27_add_fec(NULL); |
435 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 431 | imx27_add_imx2_wdt(NULL); |
436 | imx27_add_mxc_w1(NULL); | 432 | imx27_add_mxc_w1(NULL); |
437 | } | 433 | } |
438 | 434 | ||