summaryrefslogtreecommitdiffstats
path: root/drivers/pwm
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2016-08-16 10:35:02 +0100
committerThierry Reding <thierry.reding@gmail.com>2016-09-08 10:55:09 +0200
commitd66a928dc08f59b2c03bc22e910b058b4ea01f92 (patch)
tree867d190f40d48c42a5471c69a106d98759202b2c /drivers/pwm
parentf66d78faf2dc4845e06d42854769968c4166fe6c (diff)
downloadlinux-d66a928dc08f59b2c03bc22e910b058b4ea01f92.tar.bz2
pwm: sti: Supply PWM Capture clock handling
ST's PWM IP is supplied by 2 different clocks. One for PWM output and the other for capture. This patch provides clock handling for the latter. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm')
-rw-r--r--drivers/pwm/pwm-sti.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index 4e8ff9e04f77..711c33643259 100644
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -74,6 +74,7 @@ struct sti_pwm_compat_data {
struct sti_pwm_chip {
struct device *dev;
struct clk *pwm_clk;
+ struct clk *cpt_clk;
struct regmap *regmap;
struct sti_pwm_compat_data *cdata;
struct regmap_field *prescale_low;
@@ -183,6 +184,10 @@ static int sti_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
if (ret)
return ret;
+ ret = clk_enable(pc->cpt_clk);
+ if (ret)
+ return ret;
+
if (!period_same) {
ret = sti_pwm_get_prescale(pc, period_ns, &prescale);
if (ret)
@@ -227,6 +232,7 @@ static int sti_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
clk_dis:
clk_disable(pc->pwm_clk);
+ clk_disable(pc->cpt_clk);
return ret;
}
@@ -246,6 +252,10 @@ static int sti_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
if (ret)
goto out;
+ ret = clk_enable(pc->cpt_clk);
+ if (ret)
+ goto out;
+
ret = regmap_field_write(pc->pwm_out_en, 1);
if (ret) {
dev_err(dev, "failed to enable PWM device:%d\n",
@@ -271,6 +281,7 @@ static void sti_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
regmap_field_write(pc->pwm_out_en, 0);
clk_disable(pc->pwm_clk);
+ clk_disable(pc->cpt_clk);
mutex_unlock(&pc->sti_pwm_lock);
}
@@ -390,6 +401,18 @@ static int sti_pwm_probe(struct platform_device *pdev)
return ret;
}
+ pc->cpt_clk = of_clk_get_by_name(dev->of_node, "capture");
+ if (IS_ERR(pc->cpt_clk)) {
+ dev_err(dev, "failed to get PWM capture clock\n");
+ return PTR_ERR(pc->cpt_clk);
+ }
+
+ ret = clk_prepare(pc->cpt_clk);
+ if (ret) {
+ dev_err(dev, "failed to prepare clock\n");
+ return ret;
+ }
+
pc->chip.dev = dev;
pc->chip.ops = &sti_pwm_ops;
pc->chip.base = -1;
@@ -399,6 +422,7 @@ static int sti_pwm_probe(struct platform_device *pdev)
ret = pwmchip_add(&pc->chip);
if (ret < 0) {
clk_unprepare(pc->pwm_clk);
+ clk_unprepare(pc->cpt_clk);
return ret;
}
@@ -416,6 +440,7 @@ static int sti_pwm_remove(struct platform_device *pdev)
pwm_disable(&pc->chip.pwms[i]);
clk_unprepare(pc->pwm_clk);
+ clk_unprepare(pc->cpt_clk);
return pwmchip_remove(&pc->chip);
}