From patchwork Thu Feb 16 04:12:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orlando Chamberlain X-Patchwork-Id: 13142479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D23A1C636CC for ; Thu, 16 Feb 2023 04:16:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229631AbjBPEQh (ORCPT ); Wed, 15 Feb 2023 23:16:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229646AbjBPEQf (ORCPT ); Wed, 15 Feb 2023 23:16:35 -0500 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4EB242BCD; Wed, 15 Feb 2023 20:16:34 -0800 (PST) Received: by mail-pj1-x1036.google.com with SMTP id fu4-20020a17090ad18400b002341fadc370so4586887pjb.1; Wed, 15 Feb 2023 20:16:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EGrE7P/RLSwFwaWCO57vY0wVj6rzIfMRiDd6bZoW6BQ=; b=DhTPzAE3f6yq6fyPApmrGwn7zw+Dd8Ng2+RZO1N2QJTVvvM80hhWNglRiR031C/SLW 9ew8p+T1E2RPR+VOpl31+5mVoPONlVXB0XLRhCHq+xv1Uw4tzTohh9TwDd1aAq2qGHzR ftZNEsKqL38HK+fdcaLBmgBHbE25w2c32ZTuUa02ttBFad+F7mU7JWTTE39TcdlhQ37u kfNnZpnYHFdQ2nH0UAOOtSWJXGEIlEomVW/2u8uEqm2S4pUUOiHrfJxAvMqVqQODSWGh rRgEYK0CQ5YL0iS9yL6bGOIgLAam3+a7PkkhczoxQpPMJcKyPD3d/qtaFUxOf42q9BFp 08Qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EGrE7P/RLSwFwaWCO57vY0wVj6rzIfMRiDd6bZoW6BQ=; b=Cigu9v15l/vGPVrBHCAI93VK7Ej5drvS5RepS91+nrNjNHLKgkml4AFWzXOVXosFzM c3VoXFb4JjLZ5KutthObks8NsiDw89L2VEhIqp0ZRfpZ0qlJGwkw71uKrAQqp1+/xLgI a8bYOVYK9kG4WZrN3BW9rSyLykAPq3xzqBcYj3ONSXlCGtKUeXRKFq3HHE5HOQgYefvq FsgPbnFwx5cEHtAeVgsX1qUq19xYPLqSYTfFiPTfUb/ZQBlCwZe9ywZsWu5hTYpbkyQU w4C7Ww0FkGcUPED0Gqkw9Iw3RAbcTZ0DcUrgwSaDSD76fLStMmcsSLPTwkw1Q2bb2eiy Vrtw== X-Gm-Message-State: AO0yUKUWkivmFOABA/uzkLy2J6OXA8uPBtgIp6x2N6mI1JvR9Z9Zrcud WZ67gGc5G38siJjE/KVAJU0/RVIQUpIPWw== X-Google-Smtp-Source: AK7set9bY5ng4qImVqOCjmhhCoCIluxSPvPL9SM4uOleieP5iZaMKrZ0vAuJjIvZCFWCrGkyqpGJCw== X-Received: by 2002:a17:903:28c6:b0:19a:6f58:1c89 with SMTP id kv6-20020a17090328c600b0019a6f581c89mr3873457plb.59.1676520994079; Wed, 15 Feb 2023 20:16:34 -0800 (PST) Received: from localhost.localdomain ([202.53.32.211]) by smtp.gmail.com with ESMTPSA id ij21-20020a170902ab5500b00198d1993b4esm157539plb.69.2023.02.15.20.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:16:33 -0800 (PST) From: Orlando Chamberlain To: linux-input@vger.kernel.org Cc: Jonathan Corbet , Jiri Kosina , Benjamin Tissoires , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Pavel Machek , Aditya Garg , Aun-Ali Zaidi , Kerem Karabay , Andy Shevchenko , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , Orlando Chamberlain Subject: [PATCH 1/2] Documentation: leds: standardise keyboard backlight led names Date: Thu, 16 Feb 2023 15:12:26 +1100 Message-Id: <20230216041224.4731-2-orlandoch.dev@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216041224.4731-1-orlandoch.dev@gmail.com> References: <20230216041224.4731-1-orlandoch.dev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Advice use of either "input*:*:kbd_backlight" or ":*:kbd_backlight". We don't want drivers using vendor or product name (e.g. "smc", "apple", "asus") as this information is available from sysfs anyway, and it made the folder names inconsistent. Signed-off-by: Orlando Chamberlain --- Documentation/leds/well-known-leds.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Documentation/leds/well-known-leds.txt b/Documentation/leds/well-known-leds.txt index 2160382c86be..4e5429fce4d8 100644 --- a/Documentation/leds/well-known-leds.txt +++ b/Documentation/leds/well-known-leds.txt @@ -44,6 +44,14 @@ Legacy: "lp5523:kb{1,2,3,4,5,6}" (Nokia N900) Frontlight/backlight of main keyboard. +Good: ":*:kbd_backlight" +Good: "input*:*:kbd_backlight" +Legacy: "*:*:kbd_backlight" + +Many drivers have the vendor or product name as the first field of the led name, +this makes names inconsistent and is redundant as that information is already in +sysfs. + Legacy: "button-backlight" (Motorola Droid 4) Some phones have touch buttons below screen; it is different from main From patchwork Thu Feb 16 04:12:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orlando Chamberlain X-Patchwork-Id: 13142480 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC067C61DA4 for ; Thu, 16 Feb 2023 04:17:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229647AbjBPERD (ORCPT ); Wed, 15 Feb 2023 23:17:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbjBPERB (ORCPT ); Wed, 15 Feb 2023 23:17:01 -0500 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 590C342BC3; Wed, 15 Feb 2023 20:16:56 -0800 (PST) Received: by mail-pj1-x1034.google.com with SMTP id w20-20020a17090a8a1400b00233d7314c1cso4557407pjn.5; Wed, 15 Feb 2023 20:16:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s3kG3KqpAnKRH5jTko+cRrztEEz97e1+OTJ8o0f3khA=; b=mUnYM0Qa+8NUCow7tVpQ/S4tAWTr6fRV8xufSzVM9ckuZWVQN/RDLTJRnZu5UZ/Ifd trfNb8rM5YNXnhY2LrpjHIqEX6QjrgPNxr3xB+0IeGlcQEqLAdKHMrykkyL5AiIREvuz 2B7tnWWsKPY0RRb2vMIjh72YJdizV2N2a1sat+daN9AfiGXDK3BUiZDlpi+7bZy/JN2U f6eiPMXstHQEfFo/Ob4ybw3/B6eLZx0PMZ96gGX5i6mQdbMSucUuoNRoQ3q4cDztdlzn KhyDLIvTOzaD48qw/UHitsSAGs6aDHGvAhn6WGhoFoh2pFSkEMRcg25Zli+T+v/nQPLy p4Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s3kG3KqpAnKRH5jTko+cRrztEEz97e1+OTJ8o0f3khA=; b=Y0c3Ac/priMgAKukF02dmEthD+xyHTVQ+gfATGGbT69eonZnDIwAaL/Hc72mQXYbuY gwoek5XSqWZBZUEMrdTe1mA2gOaMr6Zoqm6q4PW2W/wi2kSsSzAYSimgu0S6mtfq5EUI jVzkwjHOoz1uj0nA037JWLUazgt8rwyr4kfy1qmfyvTEvBIUUPgVHWLtqfFDVPNiUsGP Gco3p0YaFXuWUgDKv9olu1VZ3uzcqZJkYnz7x/dbLNDQ0TXO6T4DSkKNKq65y/RhUPmb IFva0lAzGGIsvNYnqSr5KUv5RcCmNX+26Zh9jN5bFyWR8QTUomSm/cT/7Igcm4TM6617 5jhQ== X-Gm-Message-State: AO0yUKUh1Q/uwtcDMFF5wtZ9Jk4ofsAKPrk0S0uTUe6Z3OKstNtWVcLy OA/4hxWJ3Wb8yuOPV9e7NxJ6JZfWgJrWMg== X-Google-Smtp-Source: AK7set/XHR9Y+SBfY84GJ7SkY+frraKOEPGsltylHoB7465E4y3ipRcNxsjoRsLDfrEh5BcT561WNw== X-Received: by 2002:a17:902:fa90:b0:19a:853e:92ef with SMTP id lc16-20020a170902fa9000b0019a853e92efmr3533882plb.46.1676521015602; Wed, 15 Feb 2023 20:16:55 -0800 (PST) Received: from localhost.localdomain ([202.53.32.211]) by smtp.gmail.com with ESMTPSA id ij21-20020a170902ab5500b00198d1993b4esm157539plb.69.2023.02.15.20.16.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:16:55 -0800 (PST) From: Orlando Chamberlain To: linux-input@vger.kernel.org Cc: Jonathan Corbet , Jiri Kosina , Benjamin Tissoires , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Pavel Machek , Aditya Garg , Aun-Ali Zaidi , Kerem Karabay , Andy Shevchenko , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , Orlando Chamberlain Subject: [PATCH 2/2] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards Date: Thu, 16 Feb 2023 15:12:28 +1100 Message-Id: <20230216041224.4731-3-orlandoch.dev@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216041224.4731-1-orlandoch.dev@gmail.com> References: <20230216041224.4731-1-orlandoch.dev@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This driver adds support for the keyboard backlight on Intel T2 Macs with internal Magic Keyboards (MacBookPro16,x and MacBookAir9,1) Signed-off-by: Orlando Chamberlain Co-developed-by: Kerem Karabay Signed-off-by: Kerem Karabay --- MAINTAINERS | 6 ++ drivers/hid/Kconfig | 13 +++ drivers/hid/Makefile | 1 + drivers/hid/apple-magic-backlight.c | 125 ++++++++++++++++++++++++++++ 4 files changed, 145 insertions(+) create mode 100644 drivers/hid/apple-magic-backlight.c diff --git a/MAINTAINERS b/MAINTAINERS index fb1471cb5ed3..3319f0c3ed1e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9201,6 +9201,12 @@ F: include/linux/pm.h F: include/linux/suspend.h F: kernel/power/ +HID APPLE MAGIC BACKLIGHT DRIVER +M: Orlando Chamberlain +L: linux-input@vger.kernel.org +S: Maintained +F: drivers/hid/apple-magic-backlight.c + HID CORE LAYER M: Jiri Kosina M: Benjamin Tissoires diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e2a5d30c8895..f4702d32ce2f 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -130,6 +130,19 @@ config HID_APPLE Say Y here if you want support for keyboards of Apple iBooks, PowerBooks, MacBooks, MacBook Pros and Apple Aluminum. +config HID_APPLE_MAGIC_BACKLIGHT + tristate "Apple Magic Keyboard Backlight" + depends on USB_HID + depends on LEDS_CLASS + depends on NEW_LEDS + help + Say Y here if you want support for the keyboard backlight on Macs with + the magic keyboard (MacBookPro16,x and MacBookAir9,1). Note that this + driver is not for external magic keyboards. + + To compile this driver as a module, choose M here: the + module will be called apple-magic-backlight. + config HID_APPLEIR tristate "Apple infrared receiver" depends on (USB_HID) diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index e8014c1a2f8b..5cbfe85dd31b 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -26,6 +26,7 @@ obj-$(CONFIG_HID_ACCUTOUCH) += hid-accutouch.o obj-$(CONFIG_HID_ALPS) += hid-alps.o obj-$(CONFIG_HID_ACRUX) += hid-axff.o obj-$(CONFIG_HID_APPLE) += hid-apple.o +obj-$(CONFIG_HID_APPLE_MAGIC_BACKLIGHT) += apple-magic-backlight.o obj-$(CONFIG_HID_APPLEIR) += hid-appleir.o obj-$(CONFIG_HID_CREATIVE_SB0540) += hid-creative-sb0540.o obj-$(CONFIG_HID_ASUS) += hid-asus.o diff --git a/drivers/hid/apple-magic-backlight.c b/drivers/hid/apple-magic-backlight.c new file mode 100644 index 000000000000..ed5bcf5bb599 --- /dev/null +++ b/drivers/hid/apple-magic-backlight.c @@ -0,0 +1,125 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Apple Magic Keyboard Backlight Driver + * + * For Intel Macs with internal Magic Keyboard (MacBookPro16,1-4 and MacBookAir9,1) + * + * Copyright (c) 2022 Kerem Karabay + * Copyright (c) 2023 Orlando Chamberlain + */ + +#include +#include +#include +#include +#include +#include + +#include "hid-ids.h" + +#define HID_USAGE_MAGIC_BL 0xff00000f + +#define APPLE_MAGIC_REPORT_ID_POWER 3 +#define APPLE_MAGIC_REPORT_ID_BRIGHTNESS 1 + +struct apple_magic_backlight { + struct led_classdev cdev; + struct hid_device *hdev; + struct hid_report *brightness; + struct hid_report *power; +}; + +static void apple_magic_backlight_report_set(struct hid_report *rep, u16 value, u8 rate) +{ + rep->field[0]->value[0] = value; + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ + rep->field[1]->value[0] |= rate << 8; + + hid_hw_request(rep->device, rep, HID_REQ_SET_REPORT); +} + +static void apple_magic_backlight_set(struct apple_magic_backlight *backlight, + int brightness, char rate) +{ + apple_magic_backlight_report_set(backlight->power, brightness ? 1 : 0, rate); + if (brightness) + apple_magic_backlight_report_set(backlight->brightness, brightness, rate); +} + +static int apple_magic_backlight_led_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + struct apple_magic_backlight *backlight = container_of(led_cdev, + struct apple_magic_backlight, cdev); + + apple_magic_backlight_set(backlight, brightness, 1); + return 0; +} + +static int apple_magic_backlight_probe(struct hid_device *hdev, + const struct hid_device_id *id) +{ + struct apple_magic_backlight *backlight; + int rc; + + rc = hid_parse(hdev); + if (rc) + return rc; + + /* + * Ensure this usb endpoint is for the keyboard backlight, not touchbar + * backlight. + */ + if (!(hdev->collection && hdev->collection[0].usage == HID_USAGE_MAGIC_BL)) + return -ENODEV; + + backlight = devm_kzalloc(&hdev->dev, sizeof(*backlight), GFP_KERNEL); + if (!backlight) + return -ENOMEM; + + hid_set_drvdata(hdev, backlight); + + rc = hid_hw_start(hdev, HID_CONNECT_DEFAULT); + if (rc) + return rc; + + backlight->brightness = hid_register_report(hdev, HID_FEATURE_REPORT, + APPLE_MAGIC_REPORT_ID_BRIGHTNESS, 0); + backlight->power = hid_register_report(hdev, HID_FEATURE_REPORT, + APPLE_MAGIC_REPORT_ID_POWER, 0); + + if (!backlight->brightness || !backlight->power) { + rc = -ENODEV; + goto hw_stop; + } + + backlight->hdev = hdev; + backlight->cdev.name = ":white:" LED_FUNCTION_KBD_BACKLIGHT; + backlight->cdev.max_brightness = backlight->brightness->field[0]->logical_maximum; + backlight->cdev.brightness_set_blocking = apple_magic_backlight_led_set; + + apple_magic_backlight_set(backlight, 0, 0); + + return devm_led_classdev_register(&hdev->dev, &backlight->cdev); + +hw_stop: + hid_hw_stop(hdev); + return rc; +} + +static const struct hid_device_id apple_magic_backlight_hid_ids[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, + { } +}; +MODULE_DEVICE_TABLE(hid, apple_magic_backlight_hid_ids); + +static struct hid_driver apple_magic_backlight_hid_driver = { + .name = "apple-magic-backlight", + .id_table = apple_magic_backlight_hid_ids, + .probe = apple_magic_backlight_probe, +}; +module_hid_driver(apple_magic_backlight_hid_driver); + +MODULE_DESCRIPTION("MacBook Magic Keyboard Backlight"); +MODULE_AUTHOR("Orlando Chamberlain "); +MODULE_LICENSE("GPL");