summaryrefslogtreecommitdiff
path: root/drivers/misc
diff options
context:
space:
mode:
authorMattias Nilsson <mattias.i.nilsson@stericsson.com>2011-04-14 13:13:04 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:12 +0200
commit84907515b626bf072013cab2d005c0cd99c55037 (patch)
treeb793b5b7c8ac7d0081a2413b611f7cbf7f91d0b9 /drivers/misc
parent06426010d5f7da3dece6e27eda9cfa8ccae26688 (diff)
arm: ux500: change the ab8500-pwm clock from sysclk to ab_ulpclk
This patch removes the explicit request for sysclk from the ab8500-pwm driver, and changes the clock it is given to the internal AB8500 ULP PLL. ST Ericsson ID: 335424 ST Ericsson FOSS-OUT ID: trivial ST Ericsson Linux next: - Change-Id: I9ddb05e6caa480976286024bb305e962b86da636 Signed-off-by: Mattias Nilsson <mattias.i.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21198 Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/ab8500-pwm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/ab8500-pwm.c b/drivers/misc/ab8500-pwm.c
index cac4051ce2e..e56d9c993da 100644
--- a/drivers/misc/ab8500-pwm.c
+++ b/drivers/misc/ab8500-pwm.c
@@ -72,7 +72,7 @@ int pwm_enable(struct pwm_device *pwm)
if (!pwm->clk_enabled) {
ret = clk_enable(pwm->clk);
if (ret < 0) {
- dev_err(pwm->dev, "failed to enable sysclk\n");
+ dev_err(pwm->dev, "failed to enable clock\n");
return ret;
}
pwm->clk_enabled = true;
@@ -160,7 +160,7 @@ static int __devinit ab8500_pwm_probe(struct platform_device *pdev)
list_add_tail(&pwm->node, &pwm_list);
platform_set_drvdata(pdev, pwm);
- pwm->clk = clk_get(pwm->dev, "sysclk");
+ pwm->clk = clk_get(pwm->dev, NULL);
if (IS_ERR(pwm->clk)) {
dev_err(pwm->dev, "clock request failed\n");
ret = PTR_ERR(pwm->clk);