Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / board-omap4panda.c

diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 4ff9877f316bfece92df27ad71851774ec97b0c2..a94ce07be72ffad4b9d3b7ff5bf5301984112444 100644 (file)
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -191,13 +191,13 @@ static struct omap2_hsmmc_info mmc[] = {
 static struct regulator_consumer_supply omap4_panda_vmmc_supply[] = {
        {
                .supply = "vmmc",
-               .dev_name = "mmci-omap-hs.0",
+               .dev_name = "omap_hsmmc.0",
        },
 };
 
 static struct regulator_consumer_supply omap4_panda_vmmc5_supply = {
        .supply = "vmmc",
-       .dev_name = "mmci-omap-hs.4",
+       .dev_name = "omap_hsmmc.4",
 };
 
 static struct regulator_init_data panda_vmmc5 = {