aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@ti.com>2014-02-27 09:18:25 -0500
committerLee Jones <lee.jones@linaro.org>2014-03-13 18:25:16 -0400
commit775bb078e9af9747f7d4064939e1a50195c9fb4b (patch)
tree51b2a04e43a2314fc9ab5f3bd5d6e111c6e15922 /arch/arm
parentfedb2e7c2d7b80dfda6d906f665ff01f368e7b51 (diff)
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: Tony Lindgren <tony@atomide.com> Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 4c3b1e6df508..ad87f46eb7f0 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1955,10 +1955,6 @@ static struct omap_hwmod_class omap3xxx_usb_host_hs_hwmod_class = {
1955 .sysc = &omap3xxx_usb_host_hs_sysc, 1955 .sysc = &omap3xxx_usb_host_hs_sysc,
1956}; 1956};
1957 1957
1958static struct omap_hwmod_opt_clk omap3xxx_usb_host_hs_opt_clks[] = {
1959 { .role = "ehci_logic_fck", .clk = "usbhost_120m_fck", },
1960};
1961
1962static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = { 1958static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = {
1963 { .name = "ohci-irq", .irq = 76 + OMAP_INTC_START, }, 1959 { .name = "ohci-irq", .irq = 76 + OMAP_INTC_START, },
1964 { .name = "ehci-irq", .irq = 77 + OMAP_INTC_START, }, 1960 { .name = "ehci-irq", .irq = 77 + OMAP_INTC_START, },
@@ -1981,8 +1977,6 @@ static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = {
1981 .idlest_stdby_bit = OMAP3430ES2_ST_USBHOST_STDBY_SHIFT, 1977 .idlest_stdby_bit = OMAP3430ES2_ST_USBHOST_STDBY_SHIFT,
1982 }, 1978 },
1983 }, 1979 },
1984 .opt_clks = omap3xxx_usb_host_hs_opt_clks,
1985 .opt_clks_cnt = ARRAY_SIZE(omap3xxx_usb_host_hs_opt_clks),
1986 1980
1987 /* 1981 /*
1988 * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock 1982 * Errata: USBHOST Configured In Smart-Idle Can Lead To a Deadlock