Merge branch 'clk-omap-legacy' into clk-next

Conflicts:
	arch/arm/mach-omap2/cclock3xxx_data.c

1 files changed, 12 insertions, 0 deletions

diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h
index 172d13fd8bea..310122dcd9b5 100644
--- a/include/linux/clk/ti.h
+++ b/include/linux/clk/ti.h
@@ -218,6 +218,13 @@ struct ti_dt_clk {
 /* Maximum number of clock memmaps */
 #define CLK_MAX_MEMMAPS                 4
 
+/* Static memmap indices */
+enum {
+        TI_CLKM_CM = 0,
+        TI_CLKM_PRM,
+        TI_CLKM_SCRM,
+};
+
 typedef void (*ti_of_clk_init_cb_t)(struct clk_hw *, struct device_node *);
 
 /**
@@ -349,4 +356,9 @@ extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_ssi_wait;
 extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_dss_usbhost_wait;
 extern const struct clk_hw_omap_ops clkhwops_omap3430es2_iclk_hsotgusb_wait;
 
+int omap3430_clk_legacy_init(void);
+int omap3430es1_clk_legacy_init(void);
+int omap36xx_clk_legacy_init(void);
+int am35xx_clk_legacy_init(void);
+
 #endif