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>

3 files changed, 24 insertions, 12 deletions

diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index a1d38117138..c5f66171a71 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)
         p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;
 
         /* get hold of clock */
-        p->clk = clk_get(&p->pdev->dev, cfg->clk);
+        p->clk = clk_get(&p->pdev->dev, "cmt_fck");
         if (IS_ERR(p->clk)) {
-                dev_err(&p->pdev->dev, "cannot get clock\n");
-                ret = PTR_ERR(p->clk);
-                goto err1;
+                dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
+                p->clk = clk_get(&p->pdev->dev, cfg->clk);
+                if (IS_ERR(p->clk)) {
+                        dev_err(&p->pdev->dev, "cannot get clock\n");
+                        ret = PTR_ERR(p->clk);
+                        goto err1;
+                }
         }
 
         if (resource_size(res) == 6) {
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c
index 8ce355572d1..b11882e0f1b 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)
         p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;
 
         /* get hold of clock */
-        p->clk = clk_get(&p->pdev->dev, cfg->clk);
+        p->clk = clk_get(&p->pdev->dev, "mtu2_fck");
         if (IS_ERR(p->clk)) {
-                dev_err(&p->pdev->dev, "cannot get clock\n");
-                ret = PTR_ERR(p->clk);
-                goto err1;
+                dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
+                p->clk = clk_get(&p->pdev->dev, cfg->clk);
+                if (IS_ERR(p->clk)) {
+                        dev_err(&p->pdev->dev, "cannot get clock\n");
+                        ret = PTR_ERR(p->clk);
+                        goto err1;
+                }
         }
 
         return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
index 34239453eba..6b62283c1ab 100644
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
@@ -387,11 +387,15 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
         p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;
 
         /* get hold of clock */
-        p->clk = clk_get(&p->pdev->dev, cfg->clk);
+        p->clk = clk_get(&p->pdev->dev, "tmu_fck");
         if (IS_ERR(p->clk)) {
-                dev_err(&p->pdev->dev, "cannot get clock\n");
-                ret = PTR_ERR(p->clk);
-                goto err1;
+                dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");
+                p->clk = clk_get(&p->pdev->dev, cfg->clk);
+                if (IS_ERR(p->clk)) {
+                        dev_err(&p->pdev->dev, "cannot get clock\n");
+                        ret = PTR_ERR(p->clk);
+                        goto err1;
+                }
         }
 
         return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),