aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pwm/pwm-pxa.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
index 20370e61de5a..b78988255aee 100644
--- a/drivers/pwm/pwm-pxa.c
+++ b/drivers/pwm/pwm-pxa.c
@@ -48,7 +48,6 @@ struct pxa_pwm_chip {
48 struct device *dev; 48 struct device *dev;
49 49
50 struct clk *clk; 50 struct clk *clk;
51 int clk_enabled;
52 void __iomem *mmio_base; 51 void __iomem *mmio_base;
53}; 52};
54 53
@@ -108,24 +107,15 @@ static int pxa_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
108static int pxa_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm) 107static int pxa_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
109{ 108{
110 struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip); 109 struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip);
111 int rc = 0;
112 110
113 if (!pc->clk_enabled) { 111 return clk_prepare_enable(pc->clk);
114 rc = clk_prepare_enable(pc->clk);
115 if (!rc)
116 pc->clk_enabled++;
117 }
118 return rc;
119} 112}
120 113
121static void pxa_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm) 114static void pxa_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
122{ 115{
123 struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip); 116 struct pxa_pwm_chip *pc = to_pxa_pwm_chip(chip);
124 117
125 if (pc->clk_enabled) { 118 clk_disable_unprepare(pc->clk);
126 clk_disable_unprepare(pc->clk);
127 pc->clk_enabled--;
128 }
129} 119}
130 120
131static struct pwm_ops pxa_pwm_ops = { 121static struct pwm_ops pxa_pwm_ops = {
@@ -152,8 +142,6 @@ static int pwm_probe(struct platform_device *pdev)
152 if (IS_ERR(pwm->clk)) 142 if (IS_ERR(pwm->clk))
153 return PTR_ERR(pwm->clk); 143 return PTR_ERR(pwm->clk);
154 144
155 pwm->clk_enabled = 0;
156
157 pwm->chip.dev = &pdev->dev; 145 pwm->chip.dev = &pdev->dev;
158 pwm->chip.ops = &pxa_pwm_ops; 146 pwm->chip.ops = &pxa_pwm_ops;
159 pwm->chip.base = -1; 147 pwm->chip.base = -1;