Merge branch 'fix/asoc' into for-linus

1 files changed, 16 insertions, 2 deletions

diff --git a/include/linux/platform_data/mv_usb.h b/include/linux/platform_data/mv_usb.h
index e9d9149ddf38..d94804aca764 100644
--- a/include/linux/platform_data/mv_usb.h
+++ b/include/linux/platform_data/mv_usb.h
@@ -42,9 +42,23 @@ struct mv_usb_platform_data {
         /* only valid for HCD. OTG or Host only*/
         unsigned int            mode;
 
-        int     (*phy_init)(unsigned int regbase);
-        void    (*phy_deinit)(unsigned int regbase);
+        /* This flag is used for that needs id pin checked by otg */
+        unsigned int    disable_otg_clock_gating:1;
+        /* Force a_bus_req to be asserted */
+         unsigned int    otg_force_a_bus_req:1;
+
+        int     (*phy_init)(void __iomem *regbase);
+        void    (*phy_deinit)(void __iomem *regbase);
         int     (*set_vbus)(unsigned int vbus);
+        int     (*private_init)(void __iomem *opregs, void __iomem *phyregs);
 };
 
+#ifndef CONFIG_HAVE_CLK
+/* Dummy stub for clk framework */
+#define clk_get(dev, id)       NULL
+#define clk_put(clock)         do {} while (0)
+#define clk_enable(clock)      do {} while (0)
+#define clk_disable(clock)     do {} while (0)
+#endif
+
 #endif