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

Commit 8e0e7aae authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ARM: shmobile: Drop r8a7779_add_device_to_domain() 



If the r8a7779's PM domains are given names, this SoC and its boards
will be able to use rmobile_add_device_to_domain() for adding devices
to those domains and r8a7779_add_device_to_domain(), which is not
used anywhere at the moment anyway, may be dopped.

Accordingly, give names to the r8a7779's PM domains and drop
r8a7779_add_device_to_domain().

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

arch/arm/mach-shmobile/include/mach/r8a7779.h

+0 −3
Original line number Diff line number Diff line
@@ -353,11 +353,8 @@ extern struct r8a7779_pm_domain r8a7779_vdp1; 
extern struct r8a7779_pm_domain r8a7779_impx3;



extern void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd);

extern void r8a7779_add_device_to_domain(struct r8a7779_pm_domain *r8a7779_pd,

					struct platform_device *pdev);

#else

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

#define r8a7779_add_device_to_domain(pd, pdev) do { } while (0)

#endif /* CONFIG_PM */



#endif /* __ASM_R8A7779_H__ */

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

+4 −10
Original line number Diff line number Diff line
@@ -199,17 +199,8 @@ void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd) 
		pd_power_up(&r8a7779_pd->genpd);

}



void r8a7779_add_device_to_domain(struct r8a7779_pm_domain *r8a7779_pd,

				 struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;



	pm_genpd_add_device(&r8a7779_pd->genpd, dev);

	if (pm_clk_no_clocks(dev))

		pm_clk_add(dev, NULL);

}



struct r8a7779_pm_domain r8a7779_sh4a = {

	.genpd.name = "SH4A",

	.ch = {

		.chan_offs = 0x80, /* PWRSR1 .. PWRER1 */

		.isr_bit = 16, /* SH4A */
@@ -217,6 +208,7 @@ struct r8a7779_pm_domain r8a7779_sh4a = { 
};



struct r8a7779_pm_domain r8a7779_sgx = {

	.genpd.name = "SGX",

	.ch = {

		.chan_offs = 0xc0, /* PWRSR2 .. PWRER2 */

		.isr_bit = 20, /* SGX */
@@ -224,6 +216,7 @@ struct r8a7779_pm_domain r8a7779_sgx = { 
};



struct r8a7779_pm_domain r8a7779_vdp1 = {

	.genpd.name = "VDP1",

	.ch = {

		.chan_offs = 0x100, /* PWRSR3 .. PWRER3 */

		.isr_bit = 21, /* VDP */
@@ -231,6 +224,7 @@ struct r8a7779_pm_domain r8a7779_vdp1 = { 
};



struct r8a7779_pm_domain r8a7779_impx3 = {

	.genpd.name = "IMPX3",

	.ch = {

		.chan_offs = 0x140, /* PWRSR4 .. PWRER4 */

		.isr_bit = 24, /* IMP */