target/linux/s3c24xx/patches-2.6.28/005-dont-suspend-regulator.patch

   1 From: Balaji Rao <balajirrao@openmoko.org>
   2 Date: Mon, 5 Jan 2009 10:33:28 +0000 (+0000)
   3 Subject: pcf50633 remove suspend_enable/disable regulator functions
   4 X-Git-Tag: fork-to-stable-2.6.29-rc2~142
   5 X-Git-Url: http://git.openmoko.org/?p=kernel.git;a=commitdiff_plain;h=276709515c384f4239c9479b56fcf008ae37eec8
   6
   7 pcf50633 remove suspend_enable/disable regulator functions
   8
   9 Since we don't switch to PMU.standby, on suspend we should not
  10 be defining these.
  11
  12 Btw, this fixes the WSOD I observed on andy-tracking and also
  13 gets rid of the regulator related backtrace seen upon resume.
  14
  15 Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
  16 ---
  17
  18 diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c
  19 index 422dea2..889f191 100644
  20 --- a/arch/arm/plat-s3c/pm.c
  21 +++ b/arch/arm/plat-s3c/pm.c
  22 @@ -18,7 +18,6 @@
  23  #include <linux/delay.h>
  24  #include <linux/serial_core.h>
  25  #include <linux/io.h>
  26 -#include <linux/regulator/machine.h>
  27
  28  #include <asm/cacheflush.h>
  29  #include <mach/hardware.h>
  30 @@ -353,22 +352,11 @@ static void s3c_pm_finish(void)
  31         s3c_pm_check_cleanup();
  32  }
  33
  34 -static int s3c_pm_begin(suspend_state_t state)
  35 -{
  36 -        int ret = 0;
  37 -
  38 -#ifdef CONFIG_REGULATOR
  39 -        ret = regulator_suspend_prepare(state);
  40 -#endif
  41 -        return ret;
  42 -}
  43 -
  44  static struct platform_suspend_ops s3c_pm_ops = {
  45         .enter          = s3c_pm_enter,
  46         .prepare        = s3c_pm_prepare,
  47         .finish         = s3c_pm_finish,
  48         .valid          = suspend_valid_only_mem,
  49 -       .begin          = s3c_pm_begin,
  50  };
  51
  52  /* s3c_pm_init
  53 diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c
  54 index 343f43e..d284200 100644
  55 --- a/drivers/regulator/pcf50633-regulator.c
  56 +++ b/drivers/regulator/pcf50633-regulator.c
  57 @@ -249,8 +249,6 @@ struct regulator_ops pcf50633_regulator_ops = {
  58         .enable = pcf50633_regulator_enable,
  59         .disable = pcf50633_regulator_disable,
  60         .is_enabled = pcf50633_regulator_is_enabled,
  61 -       .set_suspend_enable = pcf50633_regulator_enable,
  62 -       .set_suspend_disable = pcf50633_regulator_disable,
  63  };
  64
  65  static struct regulator_desc regulators[] = {