Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753258Ab3HVOJp (ORCPT ); Thu, 22 Aug 2013 10:09:45 -0400 Received: from frisell.zx2c4.com ([192.95.5.64]:38115 "EHLO frisell.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752958Ab3HVOJn (ORCPT ); Thu, 22 Aug 2013 10:09:43 -0400 X-Greylist: delayed 399 seconds by postgrey-1.27 at vger.kernel.org; Thu, 22 Aug 2013 10:09:38 EDT DomainKey-Signature: a=rsa-sha1; c=nofws; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references; q=dns; s=mail; b= AQnFiUXc1ERAWx4pbLJee/sacnawYX+qfwhUuNx1sgYDy5/C4WssM68Eo9qkBh/x eGxu+8p2PKcSZxhiKXWK/441yLHgmZkD3pEyuKGtoiMyE3bLc2PAK5hk3VYqf1+F Hq7O2u9RZO8sQht5QyoduPjBEYOPmdu1ibUykN1TveQ= From: "Jason A. Donenfeld" 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" Subject: [PATCH 2/3] thinkpad_acpi: Support micmute LED Date: Thu, 22 Aug 2013 16:02:11 +0200 Message-Id: <1377180132-4933-2-git-send-email-Jason@zx2c4.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1377180132-4933-1-git-send-email-Jason@zx2c4.com> References: <1377180132-4933-1-git-send-email-Jason@zx2c4.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1410 Lines: 41 The micmute LED is currently unused. This patch allows it to be hooked up to various LED triggers. Signed-off-by: Jason A. Donenfeld --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/