From: Jens Taprogge <jens.taprogge@taprogge.org>
To: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: platform-driver-x86@vger.kernel.org
Subject: [PATCH] [thinkpad-acpi] Add T410s and T420s LED support
Date: Fri, 23 Mar 2012 00:49:34 +0100 [thread overview]
Message-ID: <20120322234934.GA8338@endeavour.taprogge.org> (raw)
A new LED is integrated into the Microphone mute button. On the other
hand many LEDs are missing and have been masked out from useful_leds.
The mute LED is not added to the TPACPI_SAFE_LEDS. Safe handling of
muting should first be worked out. I have tested all the masked out
LEDs (attached to dock) but I could not observe any effect.
Signed-off-by: Jens Taprogge <jens.taprogge@taprogge.org>
---
Documentation/laptops/thinkpad-acpi.txt | 4 +++-
drivers/platform/x86/thinkpad_acpi.c | 6 ++++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Documentation/laptops/thinkpad-acpi.txt b/Documentation/laptops/thinkpad-acpi.txt
index 9d66682..de7ddac 100644
--- a/Documentation/laptops/thinkpad-acpi.txt
+++ b/Documentation/laptops/thinkpad-acpi.txt
@@ -826,7 +826,9 @@ mapping:
9 - dock status 2
10, 11 - (unknown)
12 - thinkvantage
- 13, 14, 15 - (unknown)
+ 13 - (unknown)
+ 14 - mute mic
+ 15 - (unknown)
All of the above can be turned on and off and can be made to blink.
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index ea0c607..a0bc79f 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -169,6 +169,7 @@ enum tpacpi_hkey_event_t {
TP_HKEY_EV_VOL_UP = 0x1015, /* Volume up or unmute */
TP_HKEY_EV_VOL_DOWN = 0x1016, /* Volume down or unmute */
TP_HKEY_EV_VOL_MUTE = 0x1017, /* Mixer output mute */
+ TP_HKEY_EV_VOL_MUTE_MIC = 0x101b, /* Microphone mute */
/* Reasons for waking up from S3/S4 */
TP_HKEY_EV_WKUP_S3_UNDOCK = 0x2304, /* undock requested, S3 */
@@ -5055,6 +5056,8 @@ static const char * const tpacpi_led_names[TPACPI_LED_NUMLEDS] = {
"tpacpi::unknown_led2",
"tpacpi::unknown_led3",
"tpacpi::thinkvantage",
+ "tpacpi::unknown_led4",
+ "tpacpi::mute_mic",
};
#define TPACPI_SAFE_LEDS 0x1081U
@@ -5272,6 +5275,9 @@ static const struct tpacpi_quirk led_useful_qtable[] __initconst = {
TPACPI_Q_IBM('7', 'F', 0x1f97), /* Z61* (1) */
TPACPI_Q_IBM('7', 'B', 0x1fb7), /* X60 (1) */
+ TPACPI_Q_LNV('6', 'U', 0x4087), /* T410s */
+ TPACPI_Q_LNV('8', 'C', 0x4087), /* T420s */
+
/* (1) - may have excess leds enabled on MSB */
/* Defaults (order matters, keep last, don't reorder!) */
--
1.7.5.4
next reply other threads:[~2012-03-23 0:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-22 23:49 Jens Taprogge [this message]
2012-03-23 19:39 ` [PATCH] [thinkpad-acpi] Add T410s and T420s LED support Henrique de Moraes Holschuh
2012-03-23 19:43 ` Matthew Garrett
2012-03-23 20:07 ` Jens Taprogge
2012-03-23 23:38 ` Henrique de Moraes Holschuh
2012-03-24 0:05 ` Jens Taprogge
2012-03-24 2:50 ` Henrique de Moraes Holschuh
2012-03-24 15:44 ` Jens Taprogge
2012-03-28 16:16 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120322234934.GA8338@endeavour.taprogge.org \
--to=jens.taprogge@taprogge.org \
--cc=hmh@hmh.eng.br \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox