Commit e51151a5 authored by Adrian Hunter's avatar Adrian Hunter Committed by Tony Lindgren

ARM: OMAP3: mmc-twl4030 allow arbitrary slot names, v3

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@nokia.com>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 8d75e98b
...@@ -402,8 +402,11 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) ...@@ -402,8 +402,11 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
return; return;
} }
snprintf(twl->name, ARRAY_SIZE(twl->name), "mmc%islot%i", if (c->name)
c->mmc, 1); 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->slots[0].name = twl->name;
mmc->nr_slots = 1; mmc->nr_slots = 1;
mmc->slots[0].wires = c->wires; mmc->slots[0].wires = c->wires;
......
...@@ -14,6 +14,7 @@ struct twl4030_hsmmc_info { ...@@ -14,6 +14,7 @@ struct twl4030_hsmmc_info {
bool cover_only; /* No card detect - just cover switch */ bool cover_only; /* No card detect - just cover switch */
int gpio_cd; /* or -EINVAL */ int gpio_cd; /* or -EINVAL */
int gpio_wp; /* or -EINVAL */ int gpio_wp; /* or -EINVAL */
char *name; /* or NULL for default */
struct device *dev; /* returned: pointer to mmc adapter */ struct device *dev; /* returned: pointer to mmc adapter */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment