diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-16 10:13:04 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-16 10:13:04 -0800 |
commit | aa8b550c892aa70837e36f4681cc5a20b1fea47d (patch) | |
tree | 6f6e7cc17eee52139be2634931d0538a1948d95d /drivers | |
parent | a6d3bd274b85218bf7dda925d14db81e1a8268b3 (diff) | |
parent | 035688d9c64c61957dd272a1e773f27b0143704d (diff) | |
download | linux-stable-aa8b550c892aa70837e36f4681cc5a20b1fea47d.tar.gz linux-stable-aa8b550c892aa70837e36f4681cc5a20b1fea47d.tar.bz2 linux-stable-aa8b550c892aa70837e36f4681cc5a20b1fea47d.zip |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH fixes from Paul Mundt.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
sh: ecovec: add sample amixer settings
sh: Fix up stack debugging build.
sh: wire up finit_module syscall.
sh: Fix FDPIC binary loader
sh: clkfwk: bugfix: sh_clk_div_enable() care sh_clk_div_set_rate() if div6
sh: define TASK_UNMAPPED_BASE as a page aligned constant
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/sh/clk/cpg.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/sh/clk/cpg.c b/drivers/sh/clk/cpg.c index 5aedcdf4ac5c..1ebe67cd1833 100644 --- a/drivers/sh/clk/cpg.c +++ b/drivers/sh/clk/cpg.c @@ -126,6 +126,12 @@ static int sh_clk_div_set_rate(struct clk *clk, unsigned long rate) static int sh_clk_div_enable(struct clk *clk) { + if (clk->div_mask == SH_CLK_DIV6_MSK) { + int ret = sh_clk_div_set_rate(clk, clk->rate); + if (ret < 0) + return ret; + } + sh_clk_write(sh_clk_read(clk) & ~CPG_CKSTP_BIT, clk); return 0; } |