diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-01-29 08:57:16 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-01-29 08:57:16 -0800 |
| commit | 0dffb5c57a1d76532e2f2c7398579bfce81c3e5c (patch) | |
| tree | 0785b260efb780bba220c25b8bb3fff3d2781972 /arch/arm/mach-omap2/devices.c | |
| parent | 187e688d237a6df11a2d32e8ac480b6d1fbd40b9 (diff) | |
| download | linux-0dffb5c57a1d76532e2f2c7398579bfce81c3e5c.tar.gz | |
ARM: OMAP: Fix hsmmc init, v2
The naming accidentally broke while changing the name for the driver to not to conflict with the other mmc driver. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 9d7216ff6c9f..ce03fa750775 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -421,6 +421,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, int nr_controllers) { int i; + char *name; for (i = 0; i < nr_controllers; i++) { unsigned long base, size; @@ -450,12 +451,14 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, continue; } - if (cpu_is_omap2420()) + if (cpu_is_omap2420()) { size = OMAP2420_MMC_SIZE; - else + name = "mmci-omap"; + } else { size = HSMMC_SIZE; - - omap_mmc_add(i, base, size, irq, mmc_data[i]); + name = "mmci-omap-hs"; + } + omap_mmc_add(name, i, base, size, irq, mmc_data[i]); }; } |