[PATCH 7/8] OMAP4: clock: Add CPU local timer clock node.

Turquette, Mike mturquette at ti.com
Thu Dec 8 18:02:04 EST 2011


On Fri, Sep 30, 2011 at 2:15 AM, Shilimkar, Santosh
<santosh.shilimkar at ti.com> wrote:
> On Fri, Sep 30, 2011 at 3:00 AM, Linus Walleij <linus.walleij at linaro.org> wrote:
>> 2011/9/8 Santosh Shilimkar <santosh.shilimkar at ti.com>:
>>
>>> Local timer clock is sourced from the CPU clock and hence changes
>>> along with CPU clock. These per CPU local timers are used as
>>> clock-events, so they need to be reconfigured on CPU frequency
>>> change as part of CPUfreq governor.
>>
>> This requires patch 6956/2 right?
>> http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=6956/2
>>
>> Can I add your Tested-by: to the patch as well?
>>
> Sure.

Santosh,

I've taken in Linus' patch as well as this patch while testing clk
notifiers (part of common clk framework code).

Linus' patch matches the clk based on dev_id, but the clkdev entry in
your patch populated dev_id with NULL and con_id with "smp_twd" so
things never worked correctly.  Below changed fixed it for me:

diff --git a/arch/arm/mach-omap2/clock44xx_data.c
b/arch/arm/mach-omap2/clock44xx_data.c
index ae8c292..0f8cf68 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -4114,7 +4114,7 @@ static struct omap_clk omap44xx_clks[] = {
        CLK(NULL,       "l4_div_ck",
&l4_div_ck_hw.clk,      CK_443X),
        CLK(NULL,       "lp_clk_div_ck",
&lp_clk_div_ck_hw.clk,  CK_443X),
        CLK(NULL,       "l4_wkup_clk_mux_ck",
&l4_wkup_clk_mux_ck_hw.clk,     CK_443X),
-       CLK(NULL,       "smp_twd",
&mpu_periphclk_hw.clk,  CK_443X),
+       CLK("smp_twd",  NULL,                   &mpu_periphclk_hw.clk,
 CK_443X),
        CLK(NULL,       "ocp_abe_iclk",
&ocp_abe_iclk_hw.clk,   CK_443X),
        CLK(NULL,       "per_abe_24m_fclk",
&per_abe_24m_fclk_hw.clk,       CK_443X),
        CLK(NULL,       "per_abe_nc_fclk",
&per_abe_nc_fclk_hw.clk,        CK_443X),

A better change might be for the code in smp_twd.c to match on con_id
but I'll let you guys sort that out.

Regards,
Mike



More information about the linux-arm-kernel mailing list