diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-10-29 04:56:07 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-17 02:58:13 -0500 |
commit | ae71a5622253708aa08df231e6415fe7a1e96b10 (patch) | |
tree | 4ff6463e9ab3392af9aa5aeb5b0016ec02da2bdb /arch/arm/mach-imx/mach-cpuimx27.c | |
parent | d96801b2ca47cfeddadede7a1998e1fe0eab095c (diff) |
ARM: imx: dynamically allocate mxc_w1 devices
Currently there is no platform data used in the driver. In case this
changes 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-cpuimx27.c')
-rw-r--r-- | arch/arm/mach-imx/mach-cpuimx27.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 745ee60fb068..9baaf3df048e 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c | |||
@@ -158,7 +158,6 @@ cpuimx27_nand_board_info __initconst = { | |||
158 | static struct platform_device *platform_devices[] __initdata = { | 158 | static struct platform_device *platform_devices[] __initdata = { |
159 | &eukrea_cpuimx27_nor_mtd_device, | 159 | &eukrea_cpuimx27_nor_mtd_device, |
160 | &mxc_wdt, | 160 | &mxc_wdt, |
161 | &mxc_w1_master_device, | ||
162 | }; | 161 | }; |
163 | 162 | ||
164 | static const struct imxi2c_platform_data cpuimx27_i2c1_data __initconst = { | 163 | static const struct imxi2c_platform_data cpuimx27_i2c1_data __initconst = { |
@@ -262,6 +261,7 @@ static void __init eukrea_cpuimx27_init(void) | |||
262 | 261 | ||
263 | imx27_add_fec(NULL); | 262 | imx27_add_fec(NULL); |
264 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); | 263 | platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices)); |
264 | imx27_add_mxc_w1(NULL); | ||
265 | 265 | ||
266 | #if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2) | 266 | #if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2) |
267 | /* SDHC2 can be used for Wifi */ | 267 | /* SDHC2 can be used for Wifi */ |