3.0-stable patches

added patches:
	asus-laptop-hrws-hwrs-typo.patch
	asus-nb-wmi-add-some-video-toggle-keys.patch

diff --git a/queue-3.0/asus-laptop-hrws-hwrs-typo.patch b/queue-3.0/asus-laptop-hrws-hwrs-typo.patch
new file mode 100644 (file)
index 0000000..65f3e34
--- /dev/null
+++ b/queue-3.0/asus-laptop-hrws-hwrs-typo.patch
@@ -0,0 +1,44 @@
+From 8871e99f89b7d7b1ea99de550eea2a56273f42ab Mon Sep 17 00:00:00 2001
+From: Corentin Chary <corentin.chary@gmail.com>
+Date: Mon, 20 Aug 2012 23:01:51 +0200
+Subject: asus-laptop: HRWS/HWRS typo
+
+From: Corentin Chary <corentin.chary@gmail.com>
+
+commit 8871e99f89b7d7b1ea99de550eea2a56273f42ab upstream.
+
+Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=24222
+Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
+Signed-off-by: Matthew Garrett <mjg@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/platform/x86/asus-laptop.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/platform/x86/asus-laptop.c
++++ b/drivers/platform/x86/asus-laptop.c
+@@ -646,9 +646,9 @@ static ssize_t show_infos(struct device
+        * The significance of others is yet to be found.
+        * If we don't find the method, we assume the device are present.
+        */
+-      rv = acpi_evaluate_integer(asus->handle, "HRWS", NULL, &temp);
++      rv = acpi_evaluate_integer(asus->handle, "HWRS", NULL, &temp);
+       if (!ACPI_FAILURE(rv))
+-              len += sprintf(page + len, "HRWS value         : %#x\n",
++              len += sprintf(page + len, "HWRS value         : %#x\n",
+                              (uint) temp);
+       /*
+        * Another value for userspace: the ASYM method returns 0x02 for
+@@ -1340,9 +1340,9 @@ static int asus_laptop_get_info(struct a
+        * The significance of others is yet to be found.
+        */
+       status =
+-          acpi_evaluate_integer(asus->handle, "HRWS", NULL, &hwrs_result);
++          acpi_evaluate_integer(asus->handle, "HWRS", NULL, &hwrs_result);
+       if (!ACPI_FAILURE(status))
+-              pr_notice("  HRWS returned %x", (int)hwrs_result);
++              pr_notice("  HWRS returned %x", (int)hwrs_result);
+ 
+       if (!acpi_check_handle(asus->handle, METHOD_WL_STATUS, NULL))
+               asus->have_rsts = true;

diff --git a/queue-3.0/asus-nb-wmi-add-some-video-toggle-keys.patch b/queue-3.0/asus-nb-wmi-add-some-video-toggle-keys.patch
new file mode 100644 (file)
index 0000000..c8e9bd0
--- /dev/null
+++ b/queue-3.0/asus-nb-wmi-add-some-video-toggle-keys.patch
@@ -0,0 +1,39 @@
+From 3766054fff4af1b58a1440a284907887f4d2e8be Mon Sep 17 00:00:00 2001
+From: AceLan Kao <acelan.kao@canonical.com>
+Date: Wed, 4 Jul 2012 15:20:14 +0800
+Subject: asus-nb-wmi: add some video toggle keys
+
+From: AceLan Kao <acelan.kao@canonical.com>
+
+commit 3766054fff4af1b58a1440a284907887f4d2e8be upstream.
+
+There are some new video switch keys that used by newer machines.
+0xA0 - SDSP HDMI only
+0xA1 - SDSP LCD + HDMI
+0xA2 - SDSP CRT + HDMI
+0xA3 - SDSP TV + HDMI
+But in Linux, there is no suitable userspace application to handle this,
+so, mapping them all to KEY_SWITCHVIDEOMODE.
+
+Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
+Signed-off-by: Matthew Garrett <mjg@redhat.com>
+Cc: Tim Gardner <tim.gardner@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/platform/x86/asus-nb-wmi.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/platform/x86/asus-nb-wmi.c
++++ b/drivers/platform/x86/asus-nb-wmi.c
+@@ -68,6 +68,10 @@ static const struct key_entry asus_nb_wm
+       { KE_KEY, 0x8A, { KEY_PROG1 } },
+       { KE_KEY, 0x95, { KEY_MEDIA } },
+       { KE_KEY, 0x99, { KEY_PHONE } },
++      { KE_KEY, 0xA0, { KEY_SWITCHVIDEOMODE } }, /* SDSP HDMI only */
++      { KE_KEY, 0xA1, { KEY_SWITCHVIDEOMODE } }, /* SDSP LCD + HDMI */
++      { KE_KEY, 0xA2, { KEY_SWITCHVIDEOMODE } }, /* SDSP CRT + HDMI */
++      { KE_KEY, 0xA3, { KEY_SWITCHVIDEOMODE } }, /* SDSP TV + HDMI */
+       { KE_KEY, 0xb5, { KEY_CALC } },
+       { KE_KEY, 0xc4, { KEY_KBDILLUMUP } },
+       { KE_KEY, 0xc5, { KEY_KBDILLUMDOWN } },

diff --git a/queue-3.0/series b/queue-3.0/series
index bf15ab3a232ba1a8c0182f7d59804d166cde9693..6d113bcbae692c73ed5b91ad7ab38030008edad6 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -89,3 +89,5 @@ pm-runtime-clear-power.deferred_resume-on-success-in-rpm_suspend.patch
 drivers-misc-sgi-xp-xpc_uv.c-sgi-xpc-fails-to-load-when-cpu-0-is-out-of-irq-resources.patch
 fbcon-fix-race-condition-between-console-lock-and-cursor-timer-v1.1.patch
 drm-radeon-kms-extend-the-fujitsu-d3003-s2-board-connector-quirk-to-cover-later-silicon-stepping.patch
+asus-laptop-hrws-hwrs-typo.patch
+asus-nb-wmi-add-some-video-toggle-keys.patch