[PATCH 1/2] ARM: OMAP: hwmod: align the SmartReflex fck names

[Jean Pihet]

Hi Tony,

On Wed, Oct 3, 2012 at 7:00 PM, Tony Lindgren <tony at atomide.com> wrote:
> * jean.pihet at newoldbits.com <jean.pihet at newoldbits.com> [121003 08:48]:
>> @@ -1036,8 +1036,8 @@ static struct omap_clk am33xx_clks[] = {
>>       CLK("davinci-mcasp.1",  NULL,           &mcasp1_fck,    CK_AM33XX),
>>       CLK("NULL",     "mmc2_fck",             &mmc2_fck,      CK_AM33XX),
>>       CLK(NULL,       "mmu_fck",              &mmu_fck,       CK_AM33XX),
>> -     CLK(NULL,       "smartreflex0_fck",     &smartreflex0_fck,      CK_AM33XX),
>> -     CLK(NULL,       "smartreflex1_fck",     &smartreflex1_fck,      CK_AM33XX),
>> +     CLK(NULL,       "smartreflex.0",        &smartreflex_mpu_fck,   CK_AM33XX),
>> +     CLK(NULL,       "smartreflex.1",        &smartreflex_core_fck,  CK_AM33XX),
>>       CLK(NULL,       "timer1_fck",           &timer1_fck,    CK_AM33XX),
>>       CLK(NULL,       "timer2_fck",           &timer2_fck,    CK_AM33XX),
>>       CLK(NULL,       "timer3_fck",           &timer3_fck,    CK_AM33XX),
>
> I think this should be something like this instead:
>
>         CLK("smartreflex.0",    "fck",  &smartreflex_mpu_fck,   CK_AM33XX),
>         CLK("smartreflex.1",    "fck",  &smartreflex_core_fck,  CK_AM33XX),
>
> Where the first one is the dev name, the second one is the
> alias you want to use in the client driver?
Ok, thanks for the suggestion.

It works however I get a ' smartreflex.0: alias fck already exists'
warning at boot, coming from _add_hwmod_clocks_clkdev (called from
omap_device_alloc).
Since an "fck" is implicitly added for every device (in
_add_hwmod_clocks_clkdev) I replaced "fck" in the alias definition by
NULL but the warning is still present.

What do you think? /me dives into the omap_device code for details...

> Regards,
>
> Tony

Thanks,
Jean