diff options
| author | Mattias Nilsson <mattias.i.nilsson@stericsson.com> | 2011-04-14 13:13:04 +0200 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-04-29 15:26:46 +0200 |
| commit | 47ae8f6fc70beaba1d7b03a060f64860687cbbe4 (patch) | |
| tree | 34cf780a1852ddf07ce2176d52c8f239199e9095 /drivers | |
| parent | 0f88d0ceafabf47d4c1de0e2a0ca0c22e966b0a8 (diff) | |
arm: ux500: change the ab8500-pwm clock from sysclk to ab_ulpclku8500-android-2.3_v0.69u5500-android-2.3_v0.55
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')
| -rw-r--r-- | drivers/misc/ab8500-pwm.c | 4 |
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); |