diff options
| author | Balaji Rao <balajirrao@openmoko.org> | 2008-11-20 19:46:51 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-20 19:46:51 +0000 |
| commit | 1df2598dfebdd1df5bb81c5c8d52fb311c49a7bb (patch) | |
| tree | edc6e7a329ac854555216a310851a03328dbee51 /arch/arm/plat-s3c24xx/pm.c | |
| parent | 003285f5a73979c5909d829e50465b582ee6ccf5 (diff) | |
remove_pcf50633_voltage_rails_and_friends.patch
1. Removes pmu_voltage_rails stuff and replaces it with regulator_init_data[]
2. Removes voltage_ldoX and other /sys attributes.
3. Introduces s3c2410_pm_begin method to call regulator_suspend_prepare()
Diffstat (limited to 'arch/arm/plat-s3c24xx/pm.c')
| -rw-r--r-- | arch/arm/plat-s3c24xx/pm.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c index bc37cf49f97..325631e2aed 100644 --- a/arch/arm/plat-s3c24xx/pm.c +++ b/arch/arm/plat-s3c24xx/pm.c @@ -36,6 +36,7 @@ #include <linux/delay.h> #include <linux/serial_core.h> #include <linux/io.h> +#include <linux/regulator/machine.h> #include <asm/cacheflush.h> #include <mach/hardware.h> @@ -795,9 +796,20 @@ static int s3c2410_pm_enter(suspend_state_t state) return 0; } +static int s3c2410_pm_begin(suspend_state_t state) +{ + int ret = 0; + +#ifdef CONFIG_REGULATOR + ret = regulator_suspend_prepare(state); +#endif + return ret; +} + static struct platform_suspend_ops s3c2410_pm_ops = { .enter = s3c2410_pm_enter, .valid = suspend_valid_only_mem, + .begin = s3c2410_pm_begin, }; /* s3c2410_pm_init |