diff options
author | Gabriel Fernandez <gabriel.fernandez@linaro.org> | 2015-06-23 16:09:22 +0200 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-06 12:25:38 -0700 |
commit | c4d339c69f91c20def1366c1db8af6ac7a3013a9 (patch) | |
tree | 4a9fed66fc6bcdade6e6c38ce53e268c524c2fbc /drivers/clk/st | |
parent | c14bada8f71eef63d4465aa8e3a479104a06e7c7 (diff) | |
download | linux-stable-c4d339c69f91c20def1366c1db8af6ac7a3013a9.tar.gz linux-stable-c4d339c69f91c20def1366c1db8af6ac7a3013a9.tar.bz2 linux-stable-c4d339c69f91c20def1366c1db8af6ac7a3013a9.zip |
drivers: clk: st: Fix FSYN channel values
This patch fixes the value for disabling the FSYN channel clock.
The 'is_enabled' returned value is also fixed.
Signed-off-by: Pankaj Dev <pankaj.dev@st.com>
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/st')
-rw-r--r-- | drivers/clk/st/clkgen-fsyn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/st/clkgen-fsyn.c b/drivers/clk/st/clkgen-fsyn.c index 099ed6050d25..95851c464478 100644 --- a/drivers/clk/st/clkgen-fsyn.c +++ b/drivers/clk/st/clkgen-fsyn.c @@ -489,7 +489,7 @@ static int quadfs_pll_is_enabled(struct clk_hw *hw) struct st_clk_quadfs_pll *pll = to_quadfs_pll(hw); u32 npda = CLKGEN_READ(pll, npda); - return !!npda; + return pll->data->powerup_polarity ? !npda : !!npda; } static int clk_fs660c32_vco_get_rate(unsigned long input, struct stm_fs *fs, @@ -774,7 +774,7 @@ static void quadfs_fsynth_disable(struct clk_hw *hw) if (fs->lock) spin_lock_irqsave(fs->lock, flags); - CLKGEN_WRITE(fs, nsb[fs->chan], !fs->data->standby_polarity); + CLKGEN_WRITE(fs, nsb[fs->chan], fs->data->standby_polarity); if (fs->lock) spin_unlock_irqrestore(fs->lock, flags); |