2 files changed, 14 insertions, 0 deletions

diff --git a/Documentation/ABI/testing/sysfs-platform-asus-wmi b/Documentation/ABI/testing/sysfs-platform-asus-wmi
index 2e7df91620d..019e1e29370 100644
--- a/Documentation/ABI/testing/sysfs-platform-asus-wmi
+++ b/Documentation/ABI/testing/sysfs-platform-asus-wmi
@@ -29,3 +29,10 @@ KernelVersion:	2.6.39
 Contact:        "Corentin Chary" <corentincj@iksaif.net>
 Description:
                 Control the card touchpad. 1 means on, 0 means off.
+
+What:           /sys/devices/platform/<platform>/lid_resume
+Date:           May 2012
+KernelVersion:  3.5
+Contact:        "AceLan Kao" <acelan.kao@canonical.com>
+Description:
+                Resume on lid open. 1 means on, 0 means off.
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 486f836b79d..c7a36f6b058 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -139,6 +139,9 @@ MODULE_LICENSE("GPL");
 /* Power */
 #define ASUS_WMI_DEVID_PROCESSOR_STATE  0x00120012
 
+/* Deep S3 / Resume on LID open */
+#define ASUS_WMI_DEVID_LID_RESUME       0x00120031
+
 /* DSTS masks */
 #define ASUS_WMI_DSTS_STATUS_BIT        0x00000001
 #define ASUS_WMI_DSTS_UNKNOWN_BIT       0x00000002
@@ -1368,6 +1371,7 @@ static ssize_t show_sys_wmi(struct asus_wmi *asus, int devid, char *buf)
 ASUS_WMI_CREATE_DEVICE_ATTR(touchpad, 0644, ASUS_WMI_DEVID_TOUCHPAD);
 ASUS_WMI_CREATE_DEVICE_ATTR(camera, 0644, ASUS_WMI_DEVID_CAMERA);
 ASUS_WMI_CREATE_DEVICE_ATTR(cardr, 0644, ASUS_WMI_DEVID_CARDREADER);
+ASUS_WMI_CREATE_DEVICE_ATTR(lid_resume, 0644, ASUS_WMI_DEVID_LID_RESUME);
 
 static ssize_t store_cpufv(struct device *dev, struct device_attribute *attr,
                            const char *buf, size_t count)
@@ -1393,6 +1397,7 @@ static struct attribute *platform_attributes[] = {
         &dev_attr_camera.attr,
         &dev_attr_cardr.attr,
         &dev_attr_touchpad.attr,
+        &dev_attr_lid_resume.attr,
         NULL
 };
 
@@ -1411,6 +1416,8 @@ static umode_t asus_sysfs_is_visible(struct kobject *kobj,
                 devid = ASUS_WMI_DEVID_CARDREADER;
         else if (attr == &dev_attr_touchpad.attr)
                 devid = ASUS_WMI_DEVID_TOUCHPAD;
+        else if (attr == &dev_attr_lid_resume.attr)
+                devid = ASUS_WMI_DEVID_LID_RESUME;
 
         if (devid != -1)
                 ok = !(asus_wmi_get_devstate_simple(asus, devid) < 0);