diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-02-22 03:02:25 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-02-22 03:02:25 +0400 |
| commit | 915a15593b4d9a06ec13faede49ce349650cc19d (patch) | |
| tree | 4be583c1389a9fbf1fcdd760056d05c0060c7474 /include/linux | |
| parent | 8842446ac74263f1330f46e11ed649e2b0ed6545 (diff) | |
| parent | 994c41ee0ac875797b4dfef509ac7753e2649b4d (diff) | |
| download | linux-915a15593b4d9a06ec13faede49ce349650cc19d.tar.xz | |
Merge tag 'for-v3.14-rc/omap-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.14/fixes
Several OMAP clock/PM/device data fixes for v3.14-rc. There's an OMAP5
reboot fix in there, plus a clock fix for rate computations involving
x2 multipliers.
Basic build, boot, and PM test logs are available here:
http://www.pwsan.com/omap/testlogs/prcm-fixes-a-v3.14-rc/20140219131753/
Note that most full-chip PM is broken since the v3.14 merge; it's
not caused by this series.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clk/ti.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h index 092b64168d7f..4a21a872dbbd 100644 --- a/include/linux/clk/ti.h +++ b/include/linux/clk/ti.h @@ -245,6 +245,10 @@ long omap2_dpll_round_rate(struct clk_hw *hw, unsigned long target_rate, void omap2_init_clk_clkdm(struct clk_hw *clk); unsigned long omap3_clkoutx2_recalc(struct clk_hw *hw, unsigned long parent_rate); +int omap3_clkoutx2_set_rate(struct clk_hw *hw, unsigned long rate, + unsigned long parent_rate); +long omap3_clkoutx2_round_rate(struct clk_hw *hw, unsigned long rate, + unsigned long *prate); int omap2_clkops_enable_clkdm(struct clk_hw *hw); void omap2_clkops_disable_clkdm(struct clk_hw *hw); int omap2_clk_disable_autoidle_all(void); |