Skip to contentSkip to conversation

thinkpad_acpi: Support micmute LED

PATCH NAK Jason A. Donenfeld 2 participants 2 messages Jul 13, 2015 – Jul 14, 2015 x86 platform drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 thinkpad_acpi: Support micmute LED

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

---
 drivers/platform/x86/thinkpad_acpi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +4 -2
index 33e488c..ca4c435 100644
@@ -5281,8 +5281,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)
 {
@@ -5505,7 +5507,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,
Signature · 1 line
2.4.5
#1 lore raw

NACK.

This LED needs to be hooked internally (kernel-side) to the ALSA mixer entry responsible for MIC muting. It should NOT be exposed to userspace directly.

The LED state should only be modified when the MIC mute gate state changes. This means a private trigger, directly in ALSA, like the speaker mute led.

And it most definately is not supposed to be added to TPACPI_SAFE_LEDS *ever*.

Quoted 36 lines · Jason A. Donenfeld

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

---
 drivers/platform/x86/thinkpad_acpi.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +3 -1
index 33e488c..ca4c435 100644
@@ -5281,8 +5281,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
 t
 static inline bool tpacpi_is_led_restricted(const unsigned int led)

{

drivers/platform/x86/thinkpad_acpi.c +1 -1
@@ -5505,7 +5507,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,

Signature · 4 lines
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh