Will be fixed and respinned. > -----Original Message----- > From: Stephen Boyd <sboyd@xxxxxxxxxx> > Sent: Monday, March 19, 2018 19:48 > To: Ilia Lin <ilialin@xxxxxxxxxxxxxx>; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; > linux-arm-msm@xxxxxxxxxxxxxxx; linux-clk@xxxxxxxxxxxxxxx; > sboyd@xxxxxxxxxxxxxx > Cc: mark.rutland@xxxxxxx; devicetree@xxxxxxxxxxxxxxx; > rnayak@xxxxxxxxxxxxxx; robh@xxxxxxxxxx; will.deacon@xxxxxxx; > amit.kucheria@xxxxxxxxxx; tfinkel@xxxxxxxxxxxxxx; ilialin@xxxxxxxxxxxxxx; > nicolas.dechesne@xxxxxxxxxx; celster@xxxxxxxxxxxxxx > Subject: Re: [PATCH v3 05/10] clk: qcom: cpu-8996: Add support to switch to > alternate PLL > > Quoting Ilia Lin (2018-02-14 05:59:47) > > From: Rajendra Nayak <rnayak@xxxxxxxxxxxxxx> > > > > Each of the CPU clusters on msm8996 and powered via a primary > > s/and/are/ > > > PLL and a secondary PLL. The primary PLL is what drivers the > > s/drivers/drives/ > > I make the same typo all the time! > > > CPU clk, except for times when we are reprogramming the PLL itself, > > when we temporarily switch to an alternate PLL. > > Use clock rate change notifiers to support this. > > > > Signed-off-by: Rajendra Nayak <rnayak@xxxxxxxxxxxxxx> > > Signed-off-by: Ilia Lin <ilialin@xxxxxxxxxxxxxx> > > --- > > drivers/clk/qcom/clk-cpu-8996.c | 35 > > +++++++++++++++++++++++++++++++++++ > > 1 file changed, 35 insertions(+) > > > > diff --git a/drivers/clk/qcom/clk-cpu-8996.c > > b/drivers/clk/qcom/clk-cpu-8996.c index 42489f1..75bd014 100644 > > --- a/drivers/clk/qcom/clk-cpu-8996.c > > +++ b/drivers/clk/qcom/clk-cpu-8996.c > > @@ -140,10 +140,14 @@ struct clk_cpu_8996_mux { > > u32 reg; > > u32 shift; > > u32 width; > > + struct notifier_block nb; > > struct clk_hw *pll; > > struct clk_regmap clkr; > > }; > > > > +#define to_clk_cpu_8996_mux_nb(_nb) \ > > + container_of(_nb, struct clk_cpu_8996_mux, nb) > > + > > static inline > > struct clk_cpu_8996_mux *to_clk_cpu_8996_mux_hw(struct clk_hw *hw) > { > > @@ -194,6 +198,27 @@ static int clk_cpu_8996_mux_set_parent(struct > clk_hw *hw, u8 index) > > return 0; > > } > > > > +int cpu_clk_notifier_cb(struct notifier_block *nb, unsigned long event, > > + void *data) > > +{ > > + int ret; > > + struct clk_cpu_8996_mux *cpuclk = to_clk_cpu_8996_mux_nb(nb); > > + > > + switch (event) { > > + case PRE_RATE_CHANGE: > > + ret = clk_cpu_8996_mux_set_parent(&cpuclk->clkr.hw, > ALT_INDEX); > > + break; > > + case POST_RATE_CHANGE: > > + ret = clk_cpu_8996_mux_set_parent(&cpuclk->clkr.hw, > PLL_INDEX); > > + break; > > + default: > > + ret = 0; > > + break; > > + } > > + > > + return notifier_from_errno(ret); }; > > + > > const struct clk_ops clk_cpu_8996_mux_ops = { > > .set_parent = clk_cpu_8996_mux_set_parent, > > .get_parent = clk_cpu_8996_mux_get_parent, @@ -237,6 +262,7 @@ > > static int clk_cpu_8996_mux_set_parent(struct clk_hw *hw, u8 index) > > .shift = 0, > > .width = 2, > > .pll = &pwrcl_pll.clkr.hw, > > + .nb.notifier_call = cpu_clk_notifier_cb, > > .clkr.hw.init = &(struct clk_init_data) { > > .name = "pwrcl_pmux", > > .parent_names = (const char *[]){ @@ -256,6 +282,7 @@ > > static int clk_cpu_8996_mux_set_parent(struct clk_hw *hw, u8 index) > > .shift = 0, > > .width = 2, > > .pll = &perfcl_pll.clkr.hw, > > + .nb.notifier_call = cpu_clk_notifier_cb, > > .clkr.hw.init = &(struct clk_init_data) { > > .name = "perfcl_pmux", > > .parent_names = (const char *[]){ @@ -331,6 +358,14 @@ > > struct clk_hw_clks { > > clk_alpha_pll_configure(&perfcl_alt_pll, regmap, &altpll_config); > > clk_alpha_pll_configure(&pwrcl_alt_pll, regmap, > > &altpll_config); > > > > + ret = clk_notifier_register(pwrcl_pmux.clkr.hw.clk, &pwrcl_pmux.nb); > > + if (ret) > > + return ret; > > + > > + ret = clk_notifier_register(perfcl_pmux.clkr.hw.clk, > &perfcl_pmux.nb); > > + if (ret) > > + return ret; > > + > > Please resend this with the other patches that need rework. -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html