Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 328690
b: refs/heads/master
c: 0d09f45
h: refs/heads/master
v: v3
  • Loading branch information
Rafael J. Wysocki committed Sep 3, 2012
1 parent 7f750cc commit 204a326
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7fcb304792649e763e460c47abc4c53085bffaee
refs/heads/master: 0d09f450b6ee2065436df9fd4e0f83f9b6d71eaa
2 changes: 2 additions & 0 deletions trunk/arch/arm/mach-shmobile/include/mach/pm-rmobile.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ 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_init_domains(struct rmobile_pm_domain domains[], int num);
extern void rmobile_add_device_to_domain(const char *domain_name,
struct platform_device *pdev);
#else
#define rmobile_init_pm_domain(pd) do { } while (0)
#define rmobile_init_domains(domains, num) do { } while (0)
#define rmobile_add_device_to_domain(name, pdev) do { } while (0)
#endif /* CONFIG_PM */

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

void rmobile_init_domains(struct rmobile_pm_domain domains[], int num)
{
int j;

for (j = 0; j < num; j++)
rmobile_init_pm_domain(&domains[j]);
}

void rmobile_add_device_to_domain(const char *domain_name,
struct platform_device *pdev)
{
Expand Down

0 comments on commit 204a326

Please sign in to comment.