leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: OMAP: Fix hsmmc init, v2

Browse Source 
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>
This commit is contained in:
Tony Lindgren 2009-01-29 08:57:16 -08:00
parent 187e688d23
commit 0dffb5c57a
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap1/devices.c
View File

@ -181,7 +181,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
} }
size = OMAP1_MMC_SIZE; size = OMAP1_MMC_SIZE;
omap_mmc_add(i, base, size, irq, mmc_data[i]); omap_mmc_add("mmci-omap", i, base, size, irq, mmc_data[i]);
}; };
} }

11
arch/arm/mach-omap2/devices.c
View File

@ -421,6 +421,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
int nr_controllers) int nr_controllers)
{ {
int i; int i;
char *name;
for (i = 0; i < nr_controllers; i++) { for (i = 0; i < nr_controllers; i++) {
unsigned long base, size; unsigned long base, size;
@ -450,12 +451,14 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
continue; continue;
} }
if (cpu_is_omap2420()) if (cpu_is_omap2420()) {
size = OMAP2420_MMC_SIZE; size = OMAP2420_MMC_SIZE;
else name = "mmci-omap";
} else {
size = HSMMC_SIZE; size = HSMMC_SIZE;
name = "mmci-omap-hs";
omap_mmc_add(i, base, size, irq, mmc_data[i]); }
omap_mmc_add(name, i, base, size, irq, mmc_data[i]);
}; };
} }

7
arch/arm/plat-omap/devices.c
View File

@ -200,14 +200,15 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
/* /*
* Register MMC devices. Called from mach-omap1 and mach-omap2 device init. * Register MMC devices. Called from mach-omap1 and mach-omap2 device init.
*/ */
int __init omap_mmc_add(int id, unsigned long base, unsigned long size, int __init omap_mmc_add(const char *name, int id, unsigned long base,
unsigned int irq, struct omap_mmc_platform_data *data) unsigned long size, unsigned int irq,
struct omap_mmc_platform_data *data)
{ {
struct platform_device *pdev; struct platform_device *pdev;
struct resource res[OMAP_MMC_NR_RES]; struct resource res[OMAP_MMC_NR_RES];
int ret; int ret;
pdev = platform_device_alloc("mmci-omap", id); pdev = platform_device_alloc(name, id);
if (!pdev) if (!pdev)
return -ENOMEM; return -ENOMEM;

10
arch/arm/plat-omap/include/mach/mmc.h
View File

@ -115,8 +115,9 @@ void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
int nr_controllers); int nr_controllers);
void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
int nr_controllers); int nr_controllers);
int omap_mmc_add(int id, unsigned long base, unsigned long size, int omap_mmc_add(const char *name, int id, unsigned long base,
unsigned int irq, struct omap_mmc_platform_data *data); unsigned long size, unsigned int irq,
struct omap_mmc_platform_data *data);
#else #else
static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, static inline void omap1_init_mmc(struct omap_mmc_platform_data **mmc_data,
int nr_controllers) int nr_controllers)
@ -126,8 +127,9 @@ static inline void omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
int nr_controllers) int nr_controllers)
{ {
} }
static inline int omap_mmc_add(int id, unsigned long base, unsigned long size, static inline int omap_mmc_add(const char *name, int id, unsigned long base,
unsigned int irq, struct omap_mmc_platform_data *data) unsigned long size, unsigned int irq,
struct omap_mmc_platform_data *data)
{ {
return 0; return 0;
} }