diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-01-28 09:00:49 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-02-25 12:06:29 -0800 |
| commit | 03208cc69fc16a8d46de49f51f49964666e4a694 (patch) | |
| tree | 08b4a61f707d891c3a3f13e192908361a736a636 /drivers | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | linux-stable-03208cc69fc16a8d46de49f51f49964666e4a694.tar.gz linux-stable-03208cc69fc16a8d46de49f51f49964666e4a694.tar.bz2 linux-stable-03208cc69fc16a8d46de49f51f49964666e4a694.zip | |
clk: ti: Fix FAPLL parent enable bit handling
Commit 163152cbbe32 ("clk: ti: Add support for FAPLL on dm816x")
added basic support for the FAPLL on dm818x, but has a bug for the
parent PLL enable bit. The FAPLL_MAIN_PLLEN is defined as BIT(3)
but the code is doing a shift on it.
This means the parent PLL won't get disabled even if all it's child
synthesizers are disabled.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Brian Hutchinson <b.hutchman@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/ti/fapll.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/ti/fapll.c b/drivers/clk/ti/fapll.c index 6ef89639a9f6..d21640634adf 100644 --- a/drivers/clk/ti/fapll.c +++ b/drivers/clk/ti/fapll.c @@ -84,7 +84,7 @@ static int ti_fapll_enable(struct clk_hw *hw) struct fapll_data *fd = to_fapll(hw); u32 v = readl_relaxed(fd->base); - v |= (1 << FAPLL_MAIN_PLLEN); + v |= FAPLL_MAIN_PLLEN; writel_relaxed(v, fd->base); return 0; @@ -95,7 +95,7 @@ static void ti_fapll_disable(struct clk_hw *hw) struct fapll_data *fd = to_fapll(hw); u32 v = readl_relaxed(fd->base); - v &= ~(1 << FAPLL_MAIN_PLLEN); + v &= ~FAPLL_MAIN_PLLEN; writel_relaxed(v, fd->base); } @@ -104,7 +104,7 @@ static int ti_fapll_is_enabled(struct clk_hw *hw) struct fapll_data *fd = to_fapll(hw); u32 v = readl_relaxed(fd->base); - return v & (1 << FAPLL_MAIN_PLLEN); + return v & FAPLL_MAIN_PLLEN; } static unsigned long ti_fapll_recalc_rate(struct clk_hw *hw, |