From 014ba70469e889ebb74516052c43fd06a419b17b Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 5 Dec 2008 16:58:46 -0800 Subject: [PATCH] Fix hsmmc init It accidentally broke while changing the name for the driver to not to conflict with the other mmc driver. Signed-off-by: Tony Lindgren --- arch/arm/plat-omap/devices.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 25c6d103d70..2c3c72f499e 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -204,9 +204,15 @@ int __init omap_mmc_add(int id, unsigned long base, unsigned long size, { struct platform_device *pdev; struct resource res[OMAP_MMC_NR_RES]; + char *name; int ret; - pdev = platform_device_alloc("mmci-omap", id); + if (cpu_class_is_omap1() || cpu_is_omap242x()) + name = "mmci-omap"; + else + name = "mmci-omap-hs"; + + pdev = platform_device_alloc(name, id); if (!pdev) return -ENOMEM; -- 2.41.1