From patchwork Thu Aug 22 14:02:10 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: 2848259 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 49B22BF547 for ; Thu, 22 Aug 2013 14:09:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 00205205AD for ; Thu, 22 Aug 2013 14:09:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E39920598 for ; Thu, 22 Aug 2013 14:09:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753105Ab3HVOJk (ORCPT ); Thu, 22 Aug 2013 10:09:40 -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 S1752958Ab3HVOJi (ORCPT ); Thu, 22 Aug 2013 10:09:38 -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; s=mail; bh=j1+YKnfTps5AbusIFVmEWJT3/Wk =; b=wwDv6JWccJ+XVOKtNPcyVen3vRE6zchfxLxGzYSu+u9nps356FgoEtjOf5W elIzPXGCW90ykM8siGb9DurXDUl8iOvkaiPQL4QUiy1JWau9/EBCKL71l9iTZ4mb FwCdUOa3gEwMFqVOU4XIPUV0pCIAXYQjzkGXJrFdj9yTw00M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=zx2c4.com; h=from:to:cc :subject:date:message-id; q=dns; s=mail; b=GLt8nyLSTT4b0WML1yP9E vM7UKOlMeI/KN9CT0bhJ83dzBQxymyfxk7Oo870SsC7PzFmN7EWii3Rjkq/jL0a2 F768ZSk1foNNrG4Y6cTFJfFL5io4r61D/Vvkl7OH3B95GvGyRIneEaxSzjdfGggz rwg9pHvYkC6krbA0RNbTYM= Received: by frisell.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 844bfc95; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Thu, 22 Aug 2013 14:02:56 +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 1/3] Input: atkbd - add LED triggers for keyboard state Date: Thu, 22 Aug 2013 16:02:10 +0200 Message-Id: <1377180132-4933-1-git-send-email-Jason@zx2c4.com> X-Mailer: git-send-email 1.8.3.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@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=ham 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 Many new laptop keyboards aren't shipping with LEDs in the keys for caps lock, num lock, and scroll lock. They do, however, ship with many LEDs for specialized functions that mostly go non-utilized by any current Linux drivers. Having a caps lock LED is very helpful in early boot full disk encryption, where a fancy GUI is not available to show that caps lock is activated. This patch wires in the caps, num, and scroll lock states of the keyboard into the generic LED trigger subsystem, so that integrators can have different LEDs activated on caps/num/scroll lock state changes. Signed-off-by: Jason A. Donenfeld --- drivers/input/keyboard/atkbd.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index 2626773..15061bf 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c @@ -28,6 +28,7 @@ #include #include #include +#include #define DRIVER_DESC "AT and PS/2 keyboard driver" @@ -302,6 +303,12 @@ static const unsigned int xl_table[] = { ATKBD_RET_NAK, ATKBD_RET_HANJA, ATKBD_RET_HANGEUL, }; +#ifdef CONFIG_LEDS_TRIGGERS +struct led_trigger *capsl_led_trigger = 0; +struct led_trigger *numl_led_trigger = 0; +struct led_trigger *scrolll_led_trigger = 0; +#endif + /* * Checks if we should mangle the scancode to extract 'release' bit * in translated mode. @@ -559,6 +566,12 @@ static int atkbd_set_leds(struct atkbd *atkbd) if (ps2_command(&atkbd->ps2dev, param, ATKBD_CMD_SETLEDS)) return -1; +#ifdef CONFIG_LEDS_TRIGGERS + led_trigger_event(capsl_led_trigger, test_bit(LED_CAPSL, dev->led) ? LED_FULL : LED_OFF); + led_trigger_event(numl_led_trigger, test_bit(LED_NUML, dev->led) ? LED_FULL : LED_OFF); + led_trigger_event(scrolll_led_trigger, test_bit(LED_SCROLLL, dev->led) ? LED_FULL : LED_OFF); +#endif + if (atkbd->extra) { param[0] = 0; param[1] = (test_bit(LED_COMPOSE, dev->led) ? 0x01 : 0) @@ -1781,12 +1794,25 @@ static const struct dmi_system_id atkbd_dmi_quirk_table[] __initconst = { static int __init atkbd_init(void) { dmi_check_system(atkbd_dmi_quirk_table); +#ifdef CONFIG_LEDS_TRIGGERS + led_trigger_register_simple("caps-lock", &capsl_led_trigger); + led_trigger_register_simple("num-lock", &numl_led_trigger); + led_trigger_register_simple("scroll-lock", &scrolll_led_trigger); +#endif return serio_register_driver(&atkbd_drv); } static void __exit atkbd_exit(void) { +#ifdef CONFIG_LEDS_TRIGGERS + led_trigger_unregister_simple(capsl_led_trigger); + capsl_led_trigger = 0; + led_trigger_unregister_simple(numl_led_trigger); + numl_led_trigger = 0; + led_trigger_unregister_simple(scrolll_led_trigger); + scrolll_led_trigger = 0; +#endif serio_unregister_driver(&atkbd_drv); }