Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-omap2/mmc-twl4030.c

+5 −2
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-omap2/mmc-twl4030.h

+1 −0
Original line number Diff line number Diff line
@@ -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 */

};