ARM: OMAP3: mmc-twl4030 allow arbitrary slot names, v3
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
parent
8d75e98b58
commit
e51151a53f
|
@ -402,8 +402,11 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
|
|||
return;
|
||||
}
|
||||
|
||||
snprintf(twl->name, ARRAY_SIZE(twl->name), "mmc%islot%i",
|
||||
c->mmc, 1);
|
||||
if (c->name)
|
||||
strncpy(twl->name, c->name, HSMMC_NAME_LEN);
|
||||
else
|
||||
snprintf(twl->name, ARRAY_SIZE(twl->name),
|
||||
"mmc%islot%i", c->mmc, 1);
|
||||
mmc->slots[0].name = twl->name;
|
||||
mmc->nr_slots = 1;
|
||||
mmc->slots[0].wires = c->wires;
|
||||
|
|
|
@ -14,6 +14,7 @@ struct twl4030_hsmmc_info {
|
|||
bool cover_only; /* No card detect - just cover switch */
|
||||
int gpio_cd; /* or -EINVAL */
|
||||
int gpio_wp; /* or -EINVAL */
|
||||
char *name; /* or NULL for default */
|
||||
struct device *dev; /* returned: pointer to mmc adapter */
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue