From patchwork Thu Aug 22 14:02:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 2848266 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6E8FD9F2F6 for ; Thu, 22 Aug 2013 14:10:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C900320452 for ; Thu, 22 Aug 2013 14:10:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28A8E2044A for ; Thu, 22 Aug 2013 14:10:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753195Ab3HVOJo (ORCPT ); Thu, 22 Aug 2013 10:09:44 -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 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references; s=mail; bh=gfpl zZKhr4VZMFE3pvfw7mM/y+8=; b=H9hwZ8qV5IVu4QVlMviGRyM4WVF7sz4Fr72P zlzZESVH3WxIq600TX6qmn3FQL8GGxawh9RP/vdI9kkHHLfrxrkEQwPHyQVEe7rk JNeAObSLMKOWPr5TOD8rnb3IuLg39NHB6wNbKza5EQslE264A+BsBtKcC2n+Gnst uI+efEI= 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= Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 9ebb8f41; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Thu, 22 Aug 2013 14:02:59 +0000 (UTC) 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-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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,