[PATCH] ACPI: Add missing Thinkpad models to OSI(Linux) white list

[PATCH] ACPI: Add missing Thinkpad models to OSI(Linux) white list

[Thomas Koch]

acpi_osi=Linux helps the mute button work properly by sending Linux a
mute key press.

Add missing Thinkpad models X61[st], X200[st], R400, R500, W500, W700,
X300, X301 to the list.

Signed-off-by: Thomas Koch <linrunner@gmx.net>
---
 drivers/acpi/blacklist.c |   58
+++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index cb96296..65dfe0e 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -305,7 +305,7 @@ static struct dmi_system_id acpi_osi_dmi_table[]
__initdata = {
 	},
 	{
 	.callback = dmi_enable_osi_linux,
-	.ident = "Lenovo ThinkPad X61",
+	.ident = "Lenovo ThinkPad X61[s][t]",
 	.matches = {
 		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
 		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X61"),
@@ -327,6 +327,62 @@ static struct dmi_system_id acpi_osi_dmi_table[]
__initdata = {
 		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T500"),
 		},
 	},
+	{
+	.callback = dmi_enable_osi_linux,
+	.ident = "Lenovo ThinkPad X200[s][t]",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X200"),
+		},
+	},
+	{
+	.callback = dmi_enable_osi_linux,
+	.ident = "Lenovo ThinkPad R400",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad R400"),
+		},
+	},
+	{
+	.callback = dmi_enable_osi_linux,
+	.ident = "Lenovo ThinkPad R500",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad R500"),
+		},
+	},
+	{
+	.callback = dmi_enable_osi_linux,
+	.ident = "Lenovo ThinkPad W500",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W500"),
+		},
+	},
+	{
+	.callback = dmi_enable_osi_linux,
+	.ident = "Lenovo ThinkPad W700[ds]",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W700"),
+		},
+	},
+	{
+	.callback = dmi_enable_osi_linux,
+	.ident = "Lenovo ThinkPad X300",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X300"),
+		},
+	},
+	{
+	.callback = dmi_enable_osi_linux,
+	.ident = "Lenovo ThinkPad X301",
+	.matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+		     DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X301"),
+		},
+	},
 	{}
 };

-- 
1.7.9.5

Re: [PATCH] ACPI: Add missing Thinkpad models to OSI(Linux) white list

[Matthew Garrett]

On Fri, Jun 14, 2013 at 06:21:38PM +0200, Thomas Koch wrote:
> acpi_osi=Linux helps the mute button work properly by sending Linux a
> mute key press.

There was a proper fix for this a while back, but it never seemed to go 
anywhere. Can you try 
http://comments.gmane.org/gmane.linux.drivers.platform.x86.devel/1895 
and see if it works? If so we should just merge that instead.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

Re: [PATCH] ACPI: Add missing Thinkpad models to OSI(Linux) white list

[Thomas Koch]

On 14.06.2013 19:45, Matthew Garrett wrote:
> On Fri, Jun 14, 2013 at 06:21:38PM +0200, Thomas Koch wrote:
>> acpi_osi=Linux helps the mute button work properly by sending Linux a
>> mute key press.
> 
> There was a proper fix for this a while back, but it never seemed to go 
> anywhere. Can you try 
> http://comments.gmane.org/gmane.linux.drivers.platform.x86.devel/1895 
> and see if it works? If so we should just merge that instead.

Hi Matthew,

I'll try to merge and test your suggestion.

My patch may be ugly but has the advantage of being well tested by quite
a bunch of users of my custom kernel:
https://launchpad.net/~linrunner/+archive/thinkpad-extras

Thomas

-- 
Thomas Koch – linrunner@gmx.net

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html