mfd: omap-usb-host: Use proper clock name instead of alias
authorRoger Quadros <rogerq@ti.com>
Thu, 27 Feb 2014 14:18:25 +0000 (16:18 +0200)
committerLee Jones <lee.jones@linaro.org>
Thu, 13 Mar 2014 22:25:16 +0000 (22:25 +0000)
Use the proper clock name 'usbhost_120m_fck' instead of the
alias 'ehci_logic_fck'

Get rid of the 'ehci_logic_fck' alias from the OMAP3 hwmod data
as well.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
drivers/mfd/omap-usb-host.c

index 4c3b1e6df50806700cbcfc3c4f582650b36cc3a3..ad87f46eb7f04825b9c4bca3c32d4161a755aebf 100644 (file)
@@ -1955,10 +1955,6 @@ static struct omap_hwmod_class omap3xxx_usb_host_hs_hwmod_class = {
        .sysc = &omap3xxx_usb_host_hs_sysc,
 };
 
-static struct omap_hwmod_opt_clk omap3xxx_usb_host_hs_opt_clks[] = {
-         { .role = "ehci_logic_fck", .clk = "usbhost_120m_fck", },
-};
-
 static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = {
        { .name = "ohci-irq", .irq = 76 + OMAP_INTC_START, },
        { .name = "ehci-irq", .irq = 77 + OMAP_INTC_START, },
@@ -1981,8 +1977,6 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {
                        .idlest_stdby_bit = OMAP3430ES2_ST_USBHOST_STDBY_SHIFT,
                },
        },
-       .opt_clks       = omap3xxx_usb_host_hs_opt_clks,
-       .opt_clks_cnt   = ARRAY_SIZE(omap3xxx_usb_host_hs_opt_clks),
 
        /*
         * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock
index c31baa743986c96194f40990b3558c843bcd96cb..865c2764a89d55d54f8dd07fd3e864607e7f90ea 100644 (file)
@@ -692,10 +692,11 @@ static int usbhs_omap_probe(struct platform_device *pdev)
 
                if (need_logic_fck) {
                        omap->ehci_logic_fck = devm_clk_get(dev,
-                                                           "ehci_logic_fck");
+                                                           "usbhost_120m_fck");
                        if (IS_ERR(omap->ehci_logic_fck)) {
                                ret = PTR_ERR(omap->ehci_logic_fck);
-                               dev_err(dev, "ehci_logic_fck failed:%d\n", ret);
+                               dev_err(dev, "usbhost_120m_fck failed:%d\n",
+                                       ret);
                                goto err_mem;
                        }
                }