[ARM] omap: convert OMAP3 to use clkdev
[linux-2.6] / arch / arm / mach-omap2 / devices.c
index 9d7216f..9730404 100644 (file)
@@ -348,6 +348,7 @@ static void __init omap_hsmmc_reset(void)
                }
 
                dummy_pdev.id = i;
+               dev_set_name(&dummy_pdev.dev, "mmci-omap-hs.%d", i);
                iclk = clk_get(dev, "mmchs_ick");
                if (iclk && clk_enable(iclk))
                        iclk = NULL;
@@ -421,6 +422,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
                        int nr_controllers)
 {
        int i;
+       char *name;
 
        for (i = 0; i < nr_controllers; i++) {
                unsigned long base, size;
@@ -450,12 +452,14 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data,
                        continue;
                }
 
-               if (cpu_is_omap2420())
+               if (cpu_is_omap2420()) {
                        size = OMAP2420_MMC_SIZE;
-               else
+                       name = "mmci-omap";
+               } else {
                        size = HSMMC_SIZE;
-
-               omap_mmc_add(i, base, size, irq, mmc_data[i]);
+                       name = "mmci-omap-hs";
+               }
+               omap_mmc_add(name, i, base, size, irq, mmc_data[i]);
        };
 }