diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-17 12:05:11 +0200 |
|---|---|---|
| committer | Mathieu J. Poirier <mathieu.poirier@linaro.org> | 2011-11-10 11:12:19 -0700 |
| commit | 98b5362799885d20b988e8193ab3f60d62197c12 (patch) | |
| tree | e1a1bbef1cfda4b997f50712093b4da3f2e498dd | |
| parent | e1e348613a63c73eaa3f6f7d329fda9ba9590977 (diff) | |
ARM: shrm: Remove powersave
Since we don't know really the status of powersave related
feature on this development track, let's remove everything,
except:
- prcmu driver: New location, which is the same as linux-next
- cpufreq: new location, same as linux-next
- regulator: keep as is for the moment, needed for the system to work.
- clocks: same as for regulator.
- pm-runtime: keep it as is.
Later patches will re-add powersave, based upon what exists on SI
u8500-android-2.3_v3.15
MTU from plat-nomadik is now used instead of own copy in mach.
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32048
| -rw-r--r-- | drivers/modem/shrm/shrm_protocol.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/modem/shrm/shrm_protocol.c b/drivers/modem/shrm/shrm_protocol.c index 883c46b4f8f..3b7abf7da61 100644 --- a/drivers/modem/shrm/shrm_protocol.c +++ b/drivers/modem/shrm/shrm_protocol.c @@ -18,7 +18,6 @@ #include <linux/modem/modem_client.h> #include <mach/prcmu.h> #include <mach/prcmu-regs.h> -#include <mach/suspend.h> #include <mach/reboot_reasons.h> #define L2_HEADER_ISI 0x0 @@ -449,9 +448,6 @@ void shm_ca_sleep_req_work(struct work_struct *work) hrtimer_start(&timer, ktime_set(0, 10*NSEC_PER_MSEC), HRTIMER_MODE_REL); -#ifdef CONFIG_UX500_SUSPEND - suspend_unblock_sleep(); -#endif atomic_dec(&ac_sleep_disable_count); } @@ -559,9 +555,6 @@ static irqreturn_t shrm_prcmu_irq_handler(int irq, void *data) switch (irq) { case IRQ_PRCMU_CA_WAKE: -#ifdef CONFIG_UX500_SUSPEND - suspend_block_sleep(); -#endif if (shrm->msr_flag) atomic_set(&ac_sleep_disable_count, 0); atomic_inc(&ac_sleep_disable_count); |