Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fcb3047 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ARM: shmobile: Use domain names when adding subdomains to power domains 



Make the power management code under arch/arm/mach-shmobile/
use pm_genpd_add_subdomain_names() for adding subdomains to power
domains, which makes it possible to drop
rmobile_pm_add_subdomain() and will allow us to carry out those
operations for domain objects stored in tables in a straightforward
way.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
parent 8e0e7aae

arch/arm/mach-shmobile/include/mach/pm-rmobile.h

+0 −3
Original line number Diff line number Diff line
@@ -33,12 +33,9 @@ struct rmobile_pm_domain *to_rmobile_pd(struct generic_pm_domain *d) 
extern void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd);

extern void rmobile_add_device_to_domain(const char *domain_name,

					struct platform_device *pdev);

extern void rmobile_pm_add_subdomain(struct rmobile_pm_domain *rmobile_pd,

				    struct rmobile_pm_domain *rmobile_sd);

#else

#define rmobile_init_pm_domain(pd) do { } while (0)

#define rmobile_add_device_to_domain(name, pdev) do { } while (0)

#define rmobile_pm_add_subdomain(pd, sd) do { } while (0)

#endif /* CONFIG_PM */



#endif /* PM_RMOBILE_H */

arch/arm/mach-shmobile/pm-rmobile.c

+0 −6
Original line number Diff line number Diff line
@@ -158,10 +158,4 @@ void rmobile_add_device_to_domain(const char *domain_name, 
	if (pm_clk_no_clocks(dev))

		pm_clk_add(dev, NULL);

}



void rmobile_pm_add_subdomain(struct rmobile_pm_domain *rmobile_pd,

			     struct rmobile_pm_domain *rmobile_sd)

{

	pm_genpd_add_subdomain(&rmobile_pd->genpd, &rmobile_sd->genpd);

}

#endif /* CONFIG_PM */

arch/arm/mach-shmobile/setup-r8a7740.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ void __init r8a7740_add_standard_devices(void) 
	rmobile_init_pm_domain(&r8a7740_pd_a3sp);

	rmobile_init_pm_domain(&r8a7740_pd_a4lc);



	rmobile_pm_add_subdomain(&r8a7740_pd_a4s, &r8a7740_pd_a3sp);

	pm_genpd_add_subdomain_names("A4S", "A3SP");



	/* add devices */

	platform_add_devices(r8a7740_early_devices,

arch/arm/mach-shmobile/setup-sh7372.c

+4 −4
Original line number Diff line number Diff line
@@ -1011,11 +1011,11 @@ void __init sh7372_add_standard_devices(void) 
	rmobile_init_pm_domain(&sh7372_pd_a3sp);

	rmobile_init_pm_domain(&sh7372_pd_a3sg);



	rmobile_pm_add_subdomain(&sh7372_pd_a4lc, &sh7372_pd_a3rv);

	rmobile_pm_add_subdomain(&sh7372_pd_a4r, &sh7372_pd_a4lc);

	pm_genpd_add_subdomain_names("A4LC", "A3RV");

	pm_genpd_add_subdomain_names("A4R", "A4LC");



	rmobile_pm_add_subdomain(&sh7372_pd_a4s, &sh7372_pd_a3sg);

	rmobile_pm_add_subdomain(&sh7372_pd_a4s, &sh7372_pd_a3sp);

	pm_genpd_add_subdomain_names("A4S", "A3SG");

	pm_genpd_add_subdomain_names("A4S", "A3SP");



	platform_add_devices(sh7372_early_devices,

			    ARRAY_SIZE(sh7372_early_devices));