[PATCH] ARM: OMAP2+: Fix bogus struct clk comparison for timer clock

[Stephen Boyd]

On 05/07/15 07:44, Tony Lindgren wrote:
> * Stephen Boyd <sboyd at codeaurora.org> [150506 17:30]:
>> On 05/06/15 07:55, Tony Lindgren wrote:
>>
>>> --- a/arch/arm/mach-omap2/timer.c
>>> +++ b/arch/arm/mach-omap2/timer.c
>>> @@ -298,7 +298,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
>>>  	if (IS_ERR(src))
>>>  		return PTR_ERR(src);
>>>  
>>> -	if (clk_get_parent(timer->fclk) != src) {
>>> +	if (!clk_is_match(clk_get_parent(timer->fclk), src)) {
>>>  		r = clk_set_parent(timer->fclk, src);
>> I also wonder why we can't just call clk_set_parent() and skip the "is
>> the parent already src" check?
>>
>> If there's a good reason for not just calling clk_set_parent() then it
>> makes sense to do the clk_is_match() thing, and you can have my ack
>>
>> Acked-by: Stephen Boyd <sboyd at codeaurora.org>
> Good point. We've been unconditionally calling it anyways and
> nobody has complained of any issues. So let's just remove the
> check.
>
> Regards,
>
> Tony
>
> 8< ----------------------
> From: Tony Lindgren <tony at atomide.com>
> Date: Tue, 5 May 2015 09:03:34 -0700
> Subject: [PATCH] ARM: OMAP2+: Remove bogus struct clk comparison for timer
>  clock
>
> With recent changes to use determine_rate, the comparison of two
> clocks won't work without clk_is_match that does __clk_get_hw
> on the clocks first.
>
> As we've been unconditionally already calling clk_set_parent
> already because of the bogus comparison, let's just remove the
> check as suggested by Stephen Boyd <sboyd at codeaurora.org>.
>
> Cc: Michael Turquette <mturquette at linaro.org>
> Cc: Paul Walmsley <paul at pwsan.com>
> Cc: Stephen Boyd <sboyd at codeaurora.org>
> Cc: Tero Kristo <t-kristo at ti.com>
> Cc: Tomeu Vizoso <tomeu.vizoso at collabora.com>
> Signed-off-by: Tony Lindgren <tony at atomide.com>

Acked-by: Stephen Boyd <sboyd at codeaurora.org>

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project