Commit 775bb078 authored by Roger Quadros's avatar Roger Quadros Committed by Lee Jones

mfd: omap-usb-host: Use proper clock name instead of alias

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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent fedb2e7c
...@@ -1955,10 +1955,6 @@ static struct omap_hwmod_class omap3xxx_usb_host_hs_hwmod_class = { ...@@ -1955,10 +1955,6 @@ static struct omap_hwmod_class omap3xxx_usb_host_hs_hwmod_class = {
.sysc = &omap3xxx_usb_host_hs_sysc, .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[] = { static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = {
{ .name = "ohci-irq", .irq = 76 + OMAP_INTC_START, }, { .name = "ohci-irq", .irq = 76 + OMAP_INTC_START, },
{ .name = "ehci-irq", .irq = 77 + OMAP_INTC_START, }, { .name = "ehci-irq", .irq = 77 + OMAP_INTC_START, },
...@@ -1981,8 +1977,6 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = { ...@@ -1981,8 +1977,6 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {
.idlest_stdby_bit = OMAP3430ES2_ST_USBHOST_STDBY_SHIFT, .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 * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock
......
...@@ -692,10 +692,11 @@ static int usbhs_omap_probe(struct platform_device *pdev) ...@@ -692,10 +692,11 @@ static int usbhs_omap_probe(struct platform_device *pdev)
if (need_logic_fck) { if (need_logic_fck) {
omap->ehci_logic_fck = devm_clk_get(dev, omap->ehci_logic_fck = devm_clk_get(dev,
"ehci_logic_fck"); "usbhost_120m_fck");
if (IS_ERR(omap->ehci_logic_fck)) { if (IS_ERR(omap->ehci_logic_fck)) {
ret = PTR_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; goto err_mem;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment