summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2014-09-29 23:38:59 -0700
committerMike Turquette <mturquette@linaro.org>2014-09-29 23:38:59 -0700
commit82de1bc86c493ad832db270635fbf4e8c237f02f (patch)
treef70562cf3ae0a777ff55da734466627e2ab2478c /include
parent6e18ff26c2b529de06207caa2be9e5f1cf520972 (diff)
parent04ed831f224d4553682f48e1b4a6b68f2622b68e (diff)
downloadlinux-82de1bc86c493ad832db270635fbf4e8c237f02f.tar.gz
linux-82de1bc86c493ad832db270635fbf4e8c237f02f.tar.bz2
linux-82de1bc86c493ad832db270635fbf4e8c237f02f.zip
Merge branch 'for-v3.18/ti-clk-driver' of github.com:t-kristo/linux-pm into clk-next
Diffstat (limited to 'include')
-rw-r--r--include/linux/clk/ti.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h
index e8d8a35034a5..f75acbf70e96 100644
--- a/include/linux/clk/ti.h
+++ b/include/linux/clk/ti.h
@@ -292,6 +292,7 @@ void omap2xxx_clkt_vps_init(void);
void __iomem *ti_clk_get_reg_addr(struct device_node *node, int index);
void ti_dt_clocks_register(struct ti_dt_clk *oclks);
void ti_dt_clk_init_provider(struct device_node *np, int index);
+void ti_dt_clk_init_retry_clks(void);
void ti_dt_clockdomains_setup(void);
int ti_clk_retry_init(struct device_node *node, struct clk_hw *hw,
ti_of_clk_init_cb_t func);