On 25 September 2014 18:28, Geert Uytterhoeven <geert+renesas@xxxxxxxxx> wrote:
> Use the just introduced genpd attach/detach callbacks to register the
> devices' module clocks, instead of doing it directly, to make it
> DT-proof.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Reviewed-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
> ---
> v3:
> - Update for callback signature changes,
> v2:
> - New
>
> arch/arm/mach-shmobile/pm-rmobile.c | 15 +++++++++++++--
> 1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
> index 717e6413d29cb998..ae846dfcd69293f7 100644
> --- a/arch/arm/mach-shmobile/pm-rmobile.c
> +++ b/arch/arm/mach-shmobile/pm-rmobile.c
> @@ -101,6 +101,17 @@ static bool rmobile_pd_active_wakeup(struct device *dev)
> return true;
> }
>
> +static void rmobile_pd_attach_dev(struct device *dev)
> +{
> + if (pm_clk_no_clocks(dev))
> + pm_clk_add(dev, NULL);
> +}
> +
> +static void rmobile_pd_detach_dev(struct device *dev)
> +{
> + pm_clk_remove(dev, NULL);
> +}
> +
> static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
> {
> struct generic_pm_domain *genpd = &rmobile_pd->genpd;
> @@ -112,6 +123,8 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
> genpd->dev_ops.active_wakeup = rmobile_pd_active_wakeup;
> genpd->power_off = rmobile_pd_power_down;
> genpd->power_on = rmobile_pd_power_up;
> + genpd->attach_dev = rmobile_pd_attach_dev;
> + genpd->detach_dev = rmobile_pd_detach_dev;
> __rmobile_pd_power_up(rmobile_pd, false);
> }
>
> @@ -130,8 +143,6 @@ void rmobile_add_device_to_domain_td(const char *domain_name,
> struct device *dev = &pdev->dev;
>
> __pm_genpd_name_add_device(domain_name, dev, td);
> - if (pm_clk_no_clocks(dev))
> - pm_clk_add(dev, NULL);
> }
>
> void rmobile_add_devices_to_domains(struct pm_domain_device data[],
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
