ARM: mach-shmobile: clock-sh7372: remove bogus pllc2 clock toggling.
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 19 Nov 2010 07:23:52 +0000 (07:23 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 24 Nov 2010 06:34:04 +0000 (15:34 +0900)
The PLLC2 clock was utilizing the same sort of enable/disable without
regard to usecount approach that the FSIDIV clock was when being used as
a PLL pass-through. This forces the enable/disable through the clock
framework, which now prevents the clock from being ripped out or modified
underneath users that have an existing handle on it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/clock-sh7372.c

index e084b423146e3906a338db398144652f422aa6cc..d440e5f456ad943979f7e5ec432cee56d91d8c77 100644 (file)
@@ -969,6 +969,11 @@ static int __init hdmi_init_pm_clock(void)
                goto out;
        }
 
+       ret = clk_enable(&sh7372_pllc2_clk);
+       if (ret < 0) {
+               pr_err("Cannot enable pllc2 clock\n");
+               goto out;
+       }
        pr_debug("PLLC2 set frequency %lu\n", rate);
 
        ret = clk_set_parent(hdmi_ick, &sh7372_pllc2_clk);
index cbeca2849918429c7b5362583ee9ad5e12d63194..e18a1241a95eca9d56797c21ec034c9cf6695688 100644 (file)
@@ -230,21 +230,13 @@ static int pllc2_set_rate(struct clk *clk,
        if (idx < 0)
                return idx;
 
-       if (rate == clk->parent->rate) {
-               pllc2_disable(clk);
-               return 0;
-       }
+       if (rate == clk->parent->rate)
+               return -EINVAL;
 
        value = __raw_readl(PLLC2CR) & ~(0x3f << 24);
 
-       if (value & 0x80000000)
-               pllc2_disable(clk);
-
        __raw_writel((value & ~0x80000000) | ((idx + 19) << 24), PLLC2CR);
 
-       if (value & 0x80000000)
-               return pllc2_enable(clk);
-
        return 0;
 }