aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/sh_mtu2.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-03-29 03:55:43 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-03-29 03:55:43 -0400
commitc2a25e819717ea34e8f682d67a3fa76f4893395b (patch)
treeb63912071c9dc3c30d7dc9fb069b570fe0dcd6f0 /drivers/clocksource/sh_mtu2.c
parent620bb636dfb36574b57a89a4c3029237d69bee04 (diff)
clocksource: Deprecate clock string across the SH drivers.
We want to get rid of the clock string from platform data entirely, depending on the clkdev-based clock lookup to do the right thing for us instead. This converts all of the SH drivers to request their associated function clocks directly, and if there is no match for that then we fall back on the legacy lookup while warning about it. After all of the outstanding CPUs have been converted to clkdev lookups the clock string will be killed off completely. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/clocksource/sh_mtu2.c')
-rw-r--r--drivers/clocksource/sh_mtu2.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index 8ce355572d16..b11882e0f1bd 100644
--- a/drivers/clocksource/sh_mtu2.c
+++ b/drivers/clocksource/sh_mtu2.c
@@ -283,11 +283,15 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev)
283 p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL; 283 p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;
284 284
285 /* get hold of clock */ 285 /* get hold of clock */
286 p->clk = clk_get(&p->pdev->dev, cfg->clk); 286 p->clk = clk_get(&p->pdev->dev, "mtu2_fck");
287 if (IS_ERR(p->clk)) { 287 if (IS_ERR(p->clk)) {
288 dev_err(&p->pdev->dev, "cannot get clock\n"); 288 dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
289 ret = PTR_ERR(p->clk); 289 p->clk = clk_get(&p->pdev->dev, cfg->clk);
290 goto err1; 290 if (IS_ERR(p->clk)) {
291 dev_err(&p->pdev->dev, "cannot get clock\n");
292 ret = PTR_ERR(p->clk);
293 goto err1;
294 }
291 } 295 }
292 296
293 return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev), 297 return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),