Skip to content

Commit

Permalink
ARM: shmobile: Use names of power domains for adding devices to them
Browse files Browse the repository at this point in the history 
Make the power management code under arch/arm/mach-shmobile/ use
names of power domains instead of pointers to domain objects for
adding devices to the domains.  This will allow us to put the
domain objects into tables and register them all in one shot
going forward.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Magnus Damm <damm@opensource.se>
  • Loading branch information
Rafael J. Wysocki committed Sep 3, 2012
1 parent 74a2799 commit 8bdd946
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 61 deletions.
16 changes: 8 additions & 8 deletions arch/arm/mach-shmobile/board-ap4evb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1461,14 +1461,14 @@ static void __init ap4evb_init(void)

platform_add_devices(ap4evb_devices, ARRAY_SIZE(ap4evb_devices));

rmobile_add_device_to_domain(&sh7372_pd_a4lc, &lcdc1_device);
rmobile_add_device_to_domain(&sh7372_pd_a4lc, &lcdc_device);
rmobile_add_device_to_domain(&sh7372_pd_a4mp, &fsi_device);

rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sh_mmcif_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi0_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi1_device);
rmobile_add_device_to_domain(&sh7372_pd_a4r, &ceu_device);
rmobile_add_device_to_domain("A4LC", &lcdc1_device);
rmobile_add_device_to_domain("A4LC", &lcdc_device);
rmobile_add_device_to_domain("A4MP", &fsi_device);

rmobile_add_device_to_domain("A3SP", &sh_mmcif_device);
rmobile_add_device_to_domain("A3SP", &sdhi0_device);
rmobile_add_device_to_domain("A3SP", &sdhi1_device);
rmobile_add_device_to_domain("A4R", &ceu_device);

hdmi_init_pm_clock();
fsi_init_pm_clock();
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/mach-shmobile/board-armadillo800eva.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1181,10 +1181,10 @@ static void __init eva_init(void)

eva_clock_init();

rmobile_add_device_to_domain(&r8a7740_pd_a4lc, &lcdc0_device);
rmobile_add_device_to_domain(&r8a7740_pd_a4lc, &hdmi_lcdc_device);
rmobile_add_device_to_domain("A4LC", &lcdc0_device);
rmobile_add_device_to_domain("A4LC", &hdmi_lcdc_device);
if (usb)
rmobile_add_device_to_domain(&r8a7740_pd_a3sp, usb);
rmobile_add_device_to_domain("A3SP", usb);
}

static void __init eva_earlytimer_init(void)
Expand Down
24 changes: 12 additions & 12 deletions arch/arm/mach-shmobile/board-mackerel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1623,20 +1623,20 @@ static void __init mackerel_init(void)

platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));

rmobile_add_device_to_domain(&sh7372_pd_a4lc, &lcdc_device);
rmobile_add_device_to_domain(&sh7372_pd_a4lc, &hdmi_lcdc_device);
rmobile_add_device_to_domain(&sh7372_pd_a4lc, &meram_device);
rmobile_add_device_to_domain(&sh7372_pd_a4mp, &fsi_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &usbhs0_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &usbhs1_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &nand_flash_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sh_mmcif_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi0_device);
rmobile_add_device_to_domain("A4LC", &lcdc_device);
rmobile_add_device_to_domain("A4LC", &hdmi_lcdc_device);
rmobile_add_device_to_domain("A4LC", &meram_device);
rmobile_add_device_to_domain("A4MP", &fsi_device);
rmobile_add_device_to_domain("A3SP", &usbhs0_device);
rmobile_add_device_to_domain("A3SP", &usbhs1_device);
rmobile_add_device_to_domain("A3SP", &nand_flash_device);
rmobile_add_device_to_domain("A3SP", &sh_mmcif_device);
rmobile_add_device_to_domain("A3SP", &sdhi0_device);
#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi1_device);
rmobile_add_device_to_domain("A3SP", &sdhi1_device);
#endif
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &sdhi2_device);
rmobile_add_device_to_domain(&sh7372_pd_a4r, &ceu_device);
rmobile_add_device_to_domain("A3SP", &sdhi2_device);
rmobile_add_device_to_domain("A4R", &ceu_device);

hdmi_init_pm_clock();
sh7372_pm_init();
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-shmobile/include/mach/pm-rmobile.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ struct rmobile_pm_domain *to_rmobile_pd(struct generic_pm_domain *d)

#ifdef CONFIG_PM
extern void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd);
extern void rmobile_add_device_to_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(pd, pdev) 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 */

Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-shmobile/pm-rmobile.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
__rmobile_pd_power_up(rmobile_pd, false);
}

void rmobile_add_device_to_domain(struct rmobile_pm_domain *rmobile_pd,
void rmobile_add_device_to_domain(const char *domain_name,
struct platform_device *pdev)
{
struct device *dev = &pdev->dev;

pm_genpd_add_device(&rmobile_pd->genpd, dev);
pm_genpd_name_add_device(domain_name, dev);
if (pm_clk_no_clocks(dev))
pm_clk_add(dev, NULL);
}
Expand Down
20 changes: 10 additions & 10 deletions arch/arm/mach-shmobile/setup-r8a7740.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,16 +688,16 @@ void __init r8a7740_add_standard_devices(void)

/* add devices to PM domain */

rmobile_add_device_to_domain(&r8a7740_pd_a3sp, &scif0_device);
rmobile_add_device_to_domain(&r8a7740_pd_a3sp, &scif1_device);
rmobile_add_device_to_domain(&r8a7740_pd_a3sp, &scif2_device);
rmobile_add_device_to_domain(&r8a7740_pd_a3sp, &scif3_device);
rmobile_add_device_to_domain(&r8a7740_pd_a3sp, &scif4_device);
rmobile_add_device_to_domain(&r8a7740_pd_a3sp, &scif5_device);
rmobile_add_device_to_domain(&r8a7740_pd_a3sp, &scif6_device);
rmobile_add_device_to_domain(&r8a7740_pd_a3sp, &scif7_device);
rmobile_add_device_to_domain(&r8a7740_pd_a3sp, &scifb_device);
rmobile_add_device_to_domain(&r8a7740_pd_a3sp, &i2c1_device);
rmobile_add_device_to_domain("A3SP", &scif0_device);
rmobile_add_device_to_domain("A3SP", &scif1_device);
rmobile_add_device_to_domain("A3SP", &scif2_device);
rmobile_add_device_to_domain("A3SP", &scif3_device);
rmobile_add_device_to_domain("A3SP", &scif4_device);
rmobile_add_device_to_domain("A3SP", &scif5_device);
rmobile_add_device_to_domain("A3SP", &scif6_device);
rmobile_add_device_to_domain("A3SP", &scif7_device);
rmobile_add_device_to_domain("A3SP", &scifb_device);
rmobile_add_device_to_domain("A3SP", &i2c1_device);
}

static void __init r8a7740_earlytimer_init(void)
Expand Down
48 changes: 24 additions & 24 deletions arch/arm/mach-shmobile/setup-sh7372.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1023,30 +1023,30 @@ void __init sh7372_add_standard_devices(void)
platform_add_devices(sh7372_late_devices,
ARRAY_SIZE(sh7372_late_devices));

rmobile_add_device_to_domain(&sh7372_pd_a3rv, &vpu_device);
rmobile_add_device_to_domain(&sh7372_pd_a4mp, &spu0_device);
rmobile_add_device_to_domain(&sh7372_pd_a4mp, &spu1_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif0_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif1_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif2_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif3_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif4_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif5_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &scif6_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &iic1_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &dma0_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &dma1_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &dma2_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &usb_dma0_device);
rmobile_add_device_to_domain(&sh7372_pd_a3sp, &usb_dma1_device);
rmobile_add_device_to_domain(&sh7372_pd_a4r, &iic0_device);
rmobile_add_device_to_domain(&sh7372_pd_a4r, &veu0_device);
rmobile_add_device_to_domain(&sh7372_pd_a4r, &veu1_device);
rmobile_add_device_to_domain(&sh7372_pd_a4r, &veu2_device);
rmobile_add_device_to_domain(&sh7372_pd_a4r, &veu3_device);
rmobile_add_device_to_domain(&sh7372_pd_a4r, &jpu_device);
rmobile_add_device_to_domain(&sh7372_pd_a4r, &tmu00_device);
rmobile_add_device_to_domain(&sh7372_pd_a4r, &tmu01_device);
rmobile_add_device_to_domain("A3RV", &vpu_device);
rmobile_add_device_to_domain("A4MP", &spu0_device);
rmobile_add_device_to_domain("A4MP", &spu1_device);
rmobile_add_device_to_domain("A3SP", &scif0_device);
rmobile_add_device_to_domain("A3SP", &scif1_device);
rmobile_add_device_to_domain("A3SP", &scif2_device);
rmobile_add_device_to_domain("A3SP", &scif3_device);
rmobile_add_device_to_domain("A3SP", &scif4_device);
rmobile_add_device_to_domain("A3SP", &scif5_device);
rmobile_add_device_to_domain("A3SP", &scif6_device);
rmobile_add_device_to_domain("A3SP", &iic1_device);
rmobile_add_device_to_domain("A3SP", &dma0_device);
rmobile_add_device_to_domain("A3SP", &dma1_device);
rmobile_add_device_to_domain("A3SP", &dma2_device);
rmobile_add_device_to_domain("A3SP", &usb_dma0_device);
rmobile_add_device_to_domain("A3SP", &usb_dma1_device);
rmobile_add_device_to_domain("A4R", &iic0_device);
rmobile_add_device_to_domain("A4R", &veu0_device);
rmobile_add_device_to_domain("A4R", &veu1_device);
rmobile_add_device_to_domain("A4R", &veu2_device);
rmobile_add_device_to_domain("A4R", &veu3_device);
rmobile_add_device_to_domain("A4R", &jpu_device);
rmobile_add_device_to_domain("A4R", &tmu00_device);
rmobile_add_device_to_domain("A4R", &tmu01_device);
}

static void __init sh7372_earlytimer_init(void)
Expand Down

0 comments on commit 8bdd946

Please sign in to comment.