aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clocksource/sh_cmt.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_cmt.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_cmt.c')
-rw-r--r--drivers/clocksource/sh_cmt.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index a1d381171388..c5f66171a713 100644
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -608,11 +608,15 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
608 p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL; 608 p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;
609 609
610 /* get hold of clock */ 610 /* get hold of clock */
611 p->clk = clk_get(&p->pdev->dev, cfg->clk); 611 p->clk = clk_get(&p->pdev->dev, "cmt_fck");
612 if (IS_ERR(p->clk)) { 612 if (IS_ERR(p->clk)) {
613 dev_err(&p->pdev->dev, "cannot get clock\n"); 613 dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
614 ret = PTR_ERR(p->clk); 614 p->clk = clk_get(&p->pdev->dev, cfg->clk);
615 goto err1; 615 if (IS_ERR(p->clk)) {
616 dev_err(&p->pdev->dev, "cannot get clock\n");
617 ret = PTR_ERR(p->clk);
618 goto err1;
619 }
616 } 620 }
617 621
618 if (resource_size(res) == 6) { 622 if (resource_size(res) == 6) {