summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorGabriel FERNANDEZ <gabriel.fernandez@st.com>2014-07-15 17:20:26 +0200
committerMike Turquette <mturquette@linaro.org>2014-07-29 07:36:49 +0200
commitfc755c8bc8f155980077cb015020ec0a97ebc5c6 (patch)
tree741bfb61d1588bc012d754ca377dd7e1f0b14054 /drivers/clk
parentclk: st: Add polarity bit indication (diff)
downloadlinux-fc755c8bc8f155980077cb015020ec0a97ebc5c6.tar.xz
linux-fc755c8bc8f155980077cb015020ec0a97ebc5c6.zip
clk: st: Add quadfs reset handling
This patch adds the support of quadfs reset handling. Signed-off-by: Olivier Bideau <olivier.bideau@st.com> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org> Acked-by: Peter Griffin <peter.griffin@linaro.org> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/st/clkgen-fsyn.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/clk/st/clkgen-fsyn.c b/drivers/clk/st/clkgen-fsyn.c
index b925580646a0..4cd10b2e3b15 100644
--- a/drivers/clk/st/clkgen-fsyn.c
+++ b/drivers/clk/st/clkgen-fsyn.c
@@ -70,12 +70,14 @@ struct clkgen_quadfs_data {
bool powerup_polarity;
bool standby_polarity;
bool nsdiv_present;
+ bool nrst_present;
struct clkgen_field ndiv;
struct clkgen_field ref_bw;
struct clkgen_field nreset;
struct clkgen_field npda;
struct clkgen_field lock_status;
+ struct clkgen_field nrst[QUADFS_MAX_CHAN];
struct clkgen_field nsb[QUADFS_MAX_CHAN];
struct clkgen_field en[QUADFS_MAX_CHAN];
struct clkgen_field mdiv[QUADFS_MAX_CHAN];
@@ -615,6 +617,9 @@ static int quadfs_fsynth_enable(struct clk_hw *hw)
CLKGEN_WRITE(fs, nsb[fs->chan], !fs->data->standby_polarity);
+ if (fs->data->nrst_present)
+ CLKGEN_WRITE(fs, nrst[fs->chan], 0);
+
if (fs->lock)
spin_unlock_irqrestore(fs->lock, flags);