| Message ID | 1495452207-6129-5-git-send-email-vivek.gautam@codeaurora.org (mailing list archive) |
|---|---|
| State | Deferred |
| Delegated to: | Andy Gross |
| Headers | show |
On 22/05/17 12:23, Vivek Gautam wrote: > Make use of reset_control_array_*() set of APIs to manage > an array of reset controllers available with the device. > > Cc: Jon Hunter <jonathanh@nvidia.com> > Cc: Thierry Reding <treding@nvidia.com> > Cc: Philipp Zabel <p.zabel@pengutronix.de> > Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org> > --- > drivers/soc/tegra/pmc.c | 91 +++++++++++++++++-------------------------------- > 1 file changed, 31 insertions(+), 60 deletions(-) > > diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c > index e233dd5dcab3..668f5d3d3635 100644 > --- a/drivers/soc/tegra/pmc.c > +++ b/drivers/soc/tegra/pmc.c > @@ -124,8 +124,8 @@ struct tegra_powergate { > unsigned int id; > struct clk **clks; > unsigned int num_clks; > - struct reset_control **resets; > - unsigned int num_resets; > + struct reset_control *reset; > + struct reset_control_array *resets; It's a shame we can't avoid this additional reset pointer, but maybe there is no good alternative for now. So ... Acked-by: Jon Hunter <jonathanh@nvidia.com> Tested-by: Jon Hunter <jonathanh@nvidia.com> Cheers Jon
Hi, On Wed, May 31, 2017 at 7:53 PM, Jon Hunter <jonathanh@nvidia.com> wrote: > > On 22/05/17 12:23, Vivek Gautam wrote: >> Make use of reset_control_array_*() set of APIs to manage >> an array of reset controllers available with the device. >> >> Cc: Jon Hunter <jonathanh@nvidia.com> >> Cc: Thierry Reding <treding@nvidia.com> >> Cc: Philipp Zabel <p.zabel@pengutronix.de> >> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org> >> --- >> drivers/soc/tegra/pmc.c | 91 +++++++++++++++++-------------------------------- >> 1 file changed, 31 insertions(+), 60 deletions(-) >> >> diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c >> index e233dd5dcab3..668f5d3d3635 100644 >> --- a/drivers/soc/tegra/pmc.c >> +++ b/drivers/soc/tegra/pmc.c >> @@ -124,8 +124,8 @@ struct tegra_powergate { >> unsigned int id; >> struct clk **clks; >> unsigned int num_clks; >> - struct reset_control **resets; >> - unsigned int num_resets; >> + struct reset_control *reset; >> + struct reset_control_array *resets; > > It's a shame we can't avoid this additional reset pointer, but maybe > there is no good alternative for now. So ... > > Acked-by: Jon Hunter <jonathanh@nvidia.com> > Tested-by: Jon Hunter <jonathanh@nvidia.com> Thanks for the testing and Ack. Best regards Vivek > > Cheers > Jon > > -- > nvpublic > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Wed, 2017-05-31 at 15:23 +0100, Jon Hunter wrote: > On 22/05/17 12:23, Vivek Gautam wrote: > > Make use of reset_control_array_*() set of APIs to manage > > an array of reset controllers available with the device. > > > > Cc: Jon Hunter <jonathanh@nvidia.com> > > Cc: Thierry Reding <treding@nvidia.com> > > Cc: Philipp Zabel <p.zabel@pengutronix.de> > > Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org> > > --- > > drivers/soc/tegra/pmc.c | 91 +++++++++++++++++-------------------------------- > > 1 file changed, 31 insertions(+), 60 deletions(-) > > > > diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c > > index e233dd5dcab3..668f5d3d3635 100644 > > --- a/drivers/soc/tegra/pmc.c > > +++ b/drivers/soc/tegra/pmc.c > > @@ -124,8 +124,8 @@ struct tegra_powergate { > > unsigned int id; > > struct clk **clks; > > unsigned int num_clks; > > - struct reset_control **resets; > > - unsigned int num_resets; > > + struct reset_control *reset; > > + struct reset_control_array *resets; > > It's a shame we can't avoid this additional reset pointer, but maybe > there is no good alternative for now. So ... > > Acked-by: Jon Hunter <jonathanh@nvidia.com> > Tested-by: Jon Hunter <jonathanh@nvidia.com> Thanks. I don't see a big functional difference between a reset_control_array and a reset_control, given that a single reset control bit already controls multiple reset lines on some devices. Maybe it would be preferable to let the reset_control_array_get functions return a struct reset_control that hides the array. I'll send a v5 to see if that would be sensible. regards Philipp -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index e233dd5dcab3..668f5d3d3635 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -124,8 +124,8 @@ struct tegra_powergate { unsigned int id; struct clk **clks; unsigned int num_clks; - struct reset_control **resets; - unsigned int num_resets; + struct reset_control *reset; + struct reset_control_array *resets; }; struct tegra_io_pad_soc { @@ -348,32 +348,20 @@ static int tegra_powergate_enable_clocks(struct tegra_powergate *pg) return err; } -static int tegra_powergate_reset_assert(struct tegra_powergate *pg) +static inline int tegra_powergate_reset_assert(struct tegra_powergate *pg) { - unsigned int i; - int err; + if (!IS_ERR_OR_NULL(pg->reset)) + return reset_control_assert(pg->reset); - for (i = 0; i < pg->num_resets; i++) { - err = reset_control_assert(pg->resets[i]); - if (err) - return err; - } - - return 0; + return reset_control_array_assert(pg->resets); } -static int tegra_powergate_reset_deassert(struct tegra_powergate *pg) +static inline int tegra_powergate_reset_deassert(struct tegra_powergate *pg) { - unsigned int i; - int err; + if (!IS_ERR_OR_NULL(pg->reset)) + return reset_control_deassert(pg->reset); - for (i = 0; i < pg->num_resets; i++) { - err = reset_control_deassert(pg->resets[i]); - if (err) - return err; - } - - return 0; + return reset_control_array_deassert(pg->resets); } static int tegra_powergate_power_up(struct tegra_powergate *pg, @@ -566,8 +554,13 @@ int tegra_powergate_sequence_power_up(unsigned int id, struct clk *clk, pg.id = id; pg.clks = &clk; pg.num_clks = 1; - pg.resets = &rst; - pg.num_resets = 1; + + /* + * Handle the reset control passed from the client separately. + * So, the pmc will either have this single reset control, or, + * have a list of reset controls managed by the driver on its own. + */ + pg.reset = rst; err = tegra_powergate_power_up(&pg, false); if (err) @@ -755,45 +748,26 @@ static int tegra_powergate_of_get_clks(struct tegra_powergate *pg, static int tegra_powergate_of_get_resets(struct tegra_powergate *pg, struct device_node *np, bool off) { - struct reset_control *rst; - unsigned int i, count; int err; - count = of_count_phandle_with_args(np, "resets", "#reset-cells"); - if (count == 0) - return -ENODEV; - - pg->resets = kcalloc(count, sizeof(rst), GFP_KERNEL); - if (!pg->resets) - return -ENOMEM; - - for (i = 0; i < count; i++) { - pg->resets[i] = of_reset_control_get_by_index(np, i); - if (IS_ERR(pg->resets[i])) { - err = PTR_ERR(pg->resets[i]); - goto error; - } - - if (off) - err = reset_control_assert(pg->resets[i]); - else - err = reset_control_deassert(pg->resets[i]); - - if (err) { - reset_control_put(pg->resets[i]); - goto error; - } + pg->resets = of_reset_control_array_get_exclusive(np); + if (IS_ERR(pg->resets)) { + pr_err("failed to get device resets\n"); + return PTR_ERR(pg->resets); } - pg->num_resets = count; + if (off) + err = reset_control_array_assert(pg->resets); + else + err = reset_control_array_deassert(pg->resets); - return 0; + if (err) + goto put_reset; -error: - while (i--) - reset_control_put(pg->resets[i]); + return 0; - kfree(pg->resets); +put_reset: + reset_control_array_put(pg->resets); return err; } @@ -885,10 +859,7 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np) pm_genpd_remove(&pg->genpd); remove_resets: - while (pg->num_resets--) - reset_control_put(pg->resets[pg->num_resets]); - - kfree(pg->resets); + reset_control_array_put(pg->resets); remove_clks: while (pg->num_clks--)
Make use of reset_control_array_*() set of APIs to manage an array of reset controllers available with the device. Cc: Jon Hunter <jonathanh@nvidia.com> Cc: Thierry Reding <treding@nvidia.com> Cc: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org> --- drivers/soc/tegra/pmc.c | 91 +++++++++++++++++-------------------------------- 1 file changed, 31 insertions(+), 60 deletions(-)