diff options
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/cclock3xxx_data.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/cclock3xxx_data.c b/arch/arm/mach-omap2/cclock3xxx_data.c index 11ed9152e665..8f5121b89688 100644 --- a/arch/arm/mach-omap2/cclock3xxx_data.c +++ b/arch/arm/mach-omap2/cclock3xxx_data.c | |||
| @@ -3497,10 +3497,6 @@ static struct omap_clk omap3xxx_clks[] = { | |||
| 3497 | CLK(NULL, "dss_tv_fck", &dss_tv_fck), | 3497 | CLK(NULL, "dss_tv_fck", &dss_tv_fck), |
| 3498 | CLK(NULL, "dss_96m_fck", &dss_96m_fck), | 3498 | CLK(NULL, "dss_96m_fck", &dss_96m_fck), |
| 3499 | CLK(NULL, "dss2_alwon_fck", &dss2_alwon_fck), | 3499 | CLK(NULL, "dss2_alwon_fck", &dss2_alwon_fck), |
| 3500 | CLK(NULL, "utmi_p1_gfclk", &dummy_ck), | ||
| 3501 | CLK(NULL, "utmi_p2_gfclk", &dummy_ck), | ||
| 3502 | CLK(NULL, "xclk60mhsp1_ck", &dummy_ck), | ||
| 3503 | CLK(NULL, "xclk60mhsp2_ck", &dummy_ck), | ||
| 3504 | CLK(NULL, "init_60m_fclk", &dummy_ck), | 3500 | CLK(NULL, "init_60m_fclk", &dummy_ck), |
| 3505 | CLK(NULL, "gpt1_fck", &gpt1_fck), | 3501 | CLK(NULL, "gpt1_fck", &gpt1_fck), |
| 3506 | CLK(NULL, "aes2_ick", &aes2_ick), | 3502 | CLK(NULL, "aes2_ick", &aes2_ick), |
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 9c7e23aa0e7f..a123ff0070bd 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 | ||
| 1958 | static struct omap_hwmod_opt_clk omap3xxx_usb_host_hs_opt_clks[] = { | ||
| 1959 | { .role = "ehci_logic_fck", .clk = "usbhost_120m_fck", }, | ||
| 1960 | }; | ||
| 1961 | |||
| 1962 | static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = { | 1958 | static 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 |
