linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: linux-acpi@vger.kernel.org, linux-input@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: mjg@redhat.com, rjw@sisk.pl, len.brown@intel.com,
	dtor@insightbb.com, "Jason A. Donenfeld" <Jason@zx2c4.com>
Subject: [PATCH 2/3] thinkpad_acpi: Support micmute LED
Date: Thu, 22 Aug 2013 16:02:11 +0200	[thread overview]
Message-ID: <1377180132-4933-2-git-send-email-Jason@zx2c4.com> (raw)
In-Reply-To: <1377180132-4933-1-git-send-email-Jason@zx2c4.com>

The micmute LED is currently unused. This patch allows it to be hooked
up to various LED triggers.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 drivers/platform/x86/thinkpad_acpi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 54d31c0..33b23cb 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -5050,8 +5050,10 @@ static const char * const tpacpi_led_names[TPACPI_LED_NUMLEDS] = {
 	"tpacpi::unknown_led2",
 	"tpacpi::unknown_led3",
 	"tpacpi::thinkvantage",
+	"tpacpi::unknown_led4",
+	"tpacpi::micmute"
 };
-#define TPACPI_SAFE_LEDS	0x1081U
+#define TPACPI_SAFE_LEDS	0x5081U
 
 static inline bool tpacpi_is_led_restricted(const unsigned int led)
 {
@@ -5274,7 +5276,7 @@ static const struct tpacpi_quirk led_useful_qtable[] __initconst = {
 	{ /* Lenovo */
 	  .vendor = PCI_VENDOR_ID_LENOVO,
 	  .bios = TPACPI_MATCH_ANY, .ec = TPACPI_MATCH_ANY,
-	  .quirks = 0x1fffU,
+	  .quirks = 0x5fffU,
 	},
 	{ /* IBM ThinkPads with no EC version string */
 	  .vendor = PCI_VENDOR_ID_IBM,
-- 
1.8.3.2

  reply	other threads:[~2013-08-22 14:02 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-22 14:02 [PATCH 1/3] Input: atkbd - add LED triggers for keyboard state Jason A. Donenfeld
2013-08-22 14:02 ` Jason A. Donenfeld [this message]
2013-08-23 18:16   ` [PATCH 2/3] thinkpad_acpi: Support micmute LED Henrique de Moraes Holschuh
2013-08-22 14:02 ` [PATCH 3/3] thinkpad_acpi: Wire unused micmute LED to capslock Jason A. Donenfeld
2013-08-22 15:39   ` Matthew Garrett
2013-08-22 17:29     ` Jason A. Donenfeld
2013-08-23 18:18   ` Henrique de Moraes Holschuh
2013-08-24 20:29     ` Jason A. Donenfeld
2013-09-22 14:26 ` [PATCH 1/3] Input: atkbd - add LED triggers for keyboard state Pavel Machek

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=1377180132-4933-2-git-send-email-Jason@zx2c4.com \
    --to=jason@zx2c4.com \
    --cc=dtor@insightbb.com \
    --cc=len.brown@intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mjg@redhat.com \
    --cc=rjw@sisk.pl \
    /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;
as well as URLs for NNTP newsgroup(s).