aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Touzeau <gabrielx.touzeau@intel.com>2013-06-14 11:14:05 +0200
committerBeare, Bruce J <bruce.j.beare@intel.com>2015-10-20 22:23:00 +0100
commit2dd1db2128b7869485c85624b81398fa24ee5f5b (patch)
treeeb7e95b4b811f892a5844314483bb451f1731678
parent23b35eaa7dfee8da3a1d4ab3c49541944655d922 (diff)
downloadedison-v3.10-2dd1db2128b7869485c85624b81398fa24ee5f5b.tar.gz
rtc-cmos: allow wake up capability for intel MID platforms
BZ: 109729 By default legacy RTC driver rtc-cmos does not have wake up capability. Merrifield platform is the first intel MID platform to use this driver. So allow wake up capability for all intel MID platforms to enable alarm wake up from low power state. Change-Id: I65873e2a8cd650241ccde2163b8cc63565eb90c3 Signed-off-by: Gabriel Touzeau <gabrielx.touzeau@intel.com> Reviewed-on: http://android.intel.com:8080/134461 Reviewed-by: Li, Ning <ning.li@intel.com> Reviewed-by: Despalles, Frederic <frederic.despalles@intel.com> Tested-by: Wang, Zhifeng <zhifeng.wang@intel.com> Reviewed-by: Yang, Bin <bin.yang@intel.com> Reviewed-by: Du, Alek <alek.du@intel.com> Reviewed-by: cactus <cactus@intel.com> Tested-by: cactus <cactus@intel.com> Reviewed-on: https://android.intel.com/425801 Reviewed-by: Wood, Brian J <brian.j.wood@intel.com> Tested-by: Wood, Brian J <brian.j.wood@intel.com> Reviewed-by: Noziska, Patrick J <patrick.j.noziska@intel.com>
-rw-r--r--drivers/rtc/rtc-cmos.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 6ae046bdb26..204d529ef22 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -1023,6 +1023,15 @@ static void cmos_wake_setup(struct device *dev)
device_init_wakeup(dev, 1);
}
+#elif defined(CONFIG_X86_INTEL_MID)
+
+static void cmos_wake_setup(struct device *dev)
+{
+ /* RTC always wakes from S1/S2/S3, and often S4/STD */
+ /* on all Intel MID platforms using legacy RTC */
+ device_init_wakeup(dev, 1);
+}
+
#else
static void cmos_wake_setup(struct device *dev)