4 files changed, 12 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index fe61976dc1a5..0769ec57a3f5 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -733,6 +733,12 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         ranges;
+                        clocks = <&init_60m_fclk>,
+                                 <&xclk60mhsp1_ck>,
+                                 <&xclk60mhsp2_ck>;
+                        clock-names = "refclk_60m_int",
+                                      "refclk_60m_ext_p1",
+                                      "refclk_60m_ext_p2";
 
                         usbhsohci: ohci@4a064800 {
                                 compatible = "ti,ohci-omap3";
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 8292ad0fe69f..19155bb84835 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -814,6 +814,12 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         ranges;
+                        clocks = <&l3init_60m_fclk>,
+                                 <&xclk60mhsp1_ck>,
+                                 <&xclk60mhsp2_ck>;
+                        clock-names = "refclk_60m_int",
+                                      "refclk_60m_ext_p1",
+                                      "refclk_60m_ext_p2";
 
                         usbhsohci: ohci@4a064800 {
                                 compatible = "ti,ohci-omap3";
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[] = {
         CLK(NULL,       "dss_tv_fck",   &dss_tv_fck),
         CLK(NULL,       "dss_96m_fck",  &dss_96m_fck),
         CLK(NULL,       "dss2_alwon_fck",       &dss2_alwon_fck),
-        CLK(NULL,       "utmi_p1_gfclk",        &dummy_ck),
-        CLK(NULL,       "utmi_p2_gfclk",        &dummy_ck),
-        CLK(NULL,       "xclk60mhsp1_ck",       &dummy_ck),
-        CLK(NULL,       "xclk60mhsp2_ck",       &dummy_ck),
         CLK(NULL,       "init_60m_fclk",        &dummy_ck),
         CLK(NULL,       "gpt1_fck",     &gpt1_fck),
         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 = {
         .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