From: tony@atomide•com (Tony Lindgren)
To: linux-arm-kernel@lists•infradead.org
Subject: regression: Clock changes in next-20141205 break at least omap4
Date: Fri, 5 Dec 2014 10:38:49 -0800 [thread overview]
Message-ID: <20141205183849.GB30437@atomide.com> (raw)
In-Reply-To: <5481F79D.4010504@codeaurora.org>
* Stephen Boyd <sboyd@codeaurora•org> [141205 10:23]:
> On 12/05/2014 08:55 AM, Tony Lindgren wrote:
> > Hi,
> >
> > Looks like commit 646cafc6aa4d ("clk: Change clk_ops->determine_rate
> > to return a clk_hw as the best parent") breaks booting at least for
> > omap4.
>
> Do you get a compilation warning in arch/arm/mach-omap2/dpll3xxx.c ?
Yes so it seems.
> From what I can tell omap3_noncore_dpll_determine_rate() hasn't been
> updated to take a clk_hw pointer instead of clk pointer. It was there in
> the original patch and I'm not sure why Mike dropped that part while
> applying.
OK that makes sense, Mike should apply that part too. Note that also
include/linux/clk/ti.h needs changed accordingly for struct clk_hw,
which you probably had in your orignal patch too. Assuming that's there,
please feel free to add:
Acked-by: Tony Lindgren <tony@atomide•com>
> diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c
> index 20e120d..c2da2a0 100644
> --- a/arch/arm/mach-omap2/dpll3xxx.c
> +++ b/arch/arm/mach-omap2/dpll3xxx.c
> @@ -474,7 +474,7 @@ void omap3_noncore_dpll_disable(struct clk_hw *hw)
> */
> long omap3_noncore_dpll_determine_rate(struct clk_hw *hw, unsigned long rate,
> unsigned long *best_parent_rate,
> - struct clk **best_parent_clk)
> + struct clk_hw **best_parent_clk)
> {
> struct clk_hw_omap *clk = to_clk_hw_omap(hw);
> struct dpll_data *dd;
> @@ -488,10 +488,10 @@ long omap3_noncore_dpll_determine_rate(struct clk_hw *hw, unsigned long rate,
>
> if (__clk_get_rate(dd->clk_bypass) == rate &&
> (dd->modes & (1 << DPLL_LOW_POWER_BYPASS))) {
> - *best_parent_clk = dd->clk_bypass;
> + *best_parent_clk = __clk_get_hw(dd->clk_bypass);
> } else {
> rate = omap2_dpll_round_rate(hw, rate, best_parent_rate);
> - *best_parent_clk = dd->clk_ref;
> + *best_parent_clk = __clk_get_hw(dd->clk_ref);
> }
>
> *best_parent_rate = rate;
> diff --git a/arch/arm/mach-omap2/dpll44xx.c b/arch/arm/mach-omap2/dpll44xx.c
> index 535822f..0e58e5a 100644
> --- a/arch/arm/mach-omap2/dpll44xx.c
> +++ b/arch/arm/mach-omap2/dpll44xx.c
> @@ -223,7 +223,7 @@ out:
> */
> long omap4_dpll_regm4xen_determine_rate(struct clk_hw *hw, unsigned long rate,
> unsigned long *best_parent_rate,
> - struct clk **best_parent_clk)
> + struct clk_hw **best_parent_clk)
> {
> struct clk_hw_omap *clk = to_clk_hw_omap(hw);
> struct dpll_data *dd;
> @@ -237,11 +237,11 @@ long omap4_dpll_regm4xen_determine_rate(struct clk_hw *hw, unsigned long rate,
>
> if (__clk_get_rate(dd->clk_bypass) == rate &&
> (dd->modes & (1 << DPLL_LOW_POWER_BYPASS))) {
> - *best_parent_clk = dd->clk_bypass;
> + *best_parent_clk = __clk_get_hw(dd->clk_bypass);
> } else {
> rate = omap4_dpll_regm4xen_round_rate(hw, rate,
> best_parent_rate);
> - *best_parent_clk = dd->clk_ref;
> + *best_parent_clk = __clk_get_hw(dd->clk_ref);
> }
>
> *best_parent_rate = rate;
>
> --
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
next prev parent reply other threads:[~2014-12-05 18:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-05 16:55 regression: Clock changes in next-20141205 break at least omap4 Tony Lindgren
2014-12-05 18:21 ` Stephen Boyd
2014-12-05 18:38 ` Tony Lindgren [this message]
[not found] ` <20141212194238.20398.33333@quantum>
[not found] ` <alpine.DEB.2.02.1412122310570.29716@utopia.booyaka.com>
[not found] ` <20141215220224.20398.98259@quantum>
2014-12-16 0:21 ` Paul Walmsley
2014-12-16 0:38 ` Tony Lindgren
2014-12-16 1:31 ` Paul Walmsley
2014-12-16 19:01 ` Stephen Boyd
2014-12-16 20:01 ` Paul Walmsley
2014-12-16 20:23 ` Russell King - ARM Linux
2014-12-16 20:45 ` Paul Walmsley
2014-12-16 20:57 ` Russell King - ARM Linux
2014-12-16 22:25 ` Paul Walmsley
2014-12-17 9:52 ` Lucas Stach
2014-12-17 11:59 ` Tero Kristo
2014-12-19 16:45 ` Paul Walmsley
2014-12-18 19:23 ` Paul Walmsley
2014-12-18 23:37 ` Mike Turquette
2014-12-19 2:15 ` Paul Walmsley
2014-12-20 0:23 ` Mike Turquette
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141205183849.GB30437@atomide.com \
--to=tony@atomide$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox