From patchwork Sat Feb 18 09:07:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Orlando Chamberlain X-Patchwork-Id: 58903 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp291310wrn; Sat, 18 Feb 2023 01:18:01 -0800 (PST) X-Google-Smtp-Source: AK7set+ULdS6IZUCifHnGHrpsGu17MevR8D7AeLvvAmUHJmVXW5RWhVZLr00xisb0ie4ajeUYNGr X-Received: by 2002:aa7:cf03:0:b0:4ac:b2dc:8d55 with SMTP id a3-20020aa7cf03000000b004acb2dc8d55mr2892106edy.14.1676711881118; Sat, 18 Feb 2023 01:18:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676711881; cv=none; d=google.com; s=arc-20160816; b=H47fdEnxHcKJC6v8QOJSlXYC2dIOQKLpcQtgNH3Q1Myh1gHQXVE1byaoIf46oJ+/sM qcipXna87/MM2GYJkCI2/U5VX95+++BC4sHWzulLDAxkALLI4lvjiwiZotBDNUbyAdjP nYzEqrEe+1BOSD9b/PqIpMsDR15hIli6vWpwGIyquDGwklMGjcyHeMUHjGMoYVCcBhpQ o6do94+1Rsy4lnGb/AdbQcH6UiaPm17aKt/rN6810yZL8x27nd1IdLPnAe4PFNiWe2iy 9KYEBN2+gnHZ0t8qmD7RDXOUrjibAbnbS1fuv7fFExMdHU7pIHaStdvcfEoKdst9b2q/ UCPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eu9n2nrdBwpYt6vr5+ilnVR3utyhRNayR4OUDEusoqI=; b=XXwa5u8nMq52uxHsCxOKLEWiSH6V1IBDFlA/lDgaYc6iaH2Lvkdju8erT5FzTYExJ2 AvzqC2G0KgERR7ko+9aplWjxZj4ITit0HUc+vQ7baz2heSLsxamrsHDm9HuOE7MOxsc/ 18CIsGkGgBqbijea5zwoa0yXKBoLANZvmZQs8Pzk524ScFtb0/Mw8sh90L6jnBYBYSlx P4coZxeoaLpZUTjInOm5lYzB19OiTzKpc5z2vqs8OY8lVojbO29z9XkLy8aT4/E+CdcM NXtQpFuXjAZ2q6nBt0T6WdIghHJ/1wE144xX5NvrwJEHYnwarrG2vppGa2HGu5Nv2mEz a2ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=TYebi0pi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k13-20020aa7d8cd000000b004acc28218e7si6144925eds.581.2023.02.18.01.17.37; Sat, 18 Feb 2023 01:18:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=TYebi0pi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229846AbjBRJIH (ORCPT + 99 others); Sat, 18 Feb 2023 04:08:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229818AbjBRJIF (ORCPT ); Sat, 18 Feb 2023 04:08:05 -0500 Received: from mail-pl1-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E129F12848; Sat, 18 Feb 2023 01:08:01 -0800 (PST) Received: by mail-pl1-x62d.google.com with SMTP id a20so582826pls.2; Sat, 18 Feb 2023 01:08:01 -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=eu9n2nrdBwpYt6vr5+ilnVR3utyhRNayR4OUDEusoqI=; b=TYebi0piKTe4gGMWizKfPlrOLqaSw5BhsW9Chx/B1b4bZKrUGDGLSruGcs/JsIKkJR vpRjnE4zaUIb5vxQO6IEdr+shHe6yfEdDEebaj7A5ZGtYEdCLO4unxelIzFHB3MKpCE/ /s4CpudBF5k11dSEzLrQVIq5zNCSqiPIOLG+E9TwjAVvcM8X7hif/d2AR+JRxXJzjDAg WIdtT85/vMuAlvM8cAvrnUSbmnDIGyoArZspZrIacJoT2eHMDY3S9jQGlKsUfoTzcjLX y8Tts7o7S2xdRR9aJYS0xZcdphJfTUm2qIunG1cwQmjmGK2V9KecdEW3HaKo2dmOQMM+ WK+w== 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=eu9n2nrdBwpYt6vr5+ilnVR3utyhRNayR4OUDEusoqI=; b=QYvkxfZXWad8a3/2VWoTlBegaIZT2n/F03hCTxqcwM4bqtjGkU0dKdcL2K/DqKvRhQ BLDNwzSrhsgPRuWt0nVb6/VnGYa57jPEySkDXNmFR78c5oBwcoNjgP+afiPgVCnm4APZ MrcIsSV3kNHcxj2b/V7EqsxcCqK48aeyMFe3/UA4xS4O6OnzEDXo6j1pzRFT5fF7CZQK 11oqcOEcePvrJeVbQCJTANzOGV2C9DLhMklYLEvT0tsMwS+uV9vHZVKu6P7VjodZJM7Z ChRM8erPhjRmSg/MBSfS1jtrKPbADdgBZJ8iv7EyM8FO+qpJViyS7+4FaMueE9sFlYem 0fWg== X-Gm-Message-State: AO0yUKUBbGVCB3CDcR7b635Qec9A3mOzoF86E47v/J5VRGW7OxWndoLG dXnmNYZcbwqSiMPQLXiustwXUpmGGRgBDw== X-Received: by 2002:a17:903:2286:b0:19a:b427:2335 with SMTP id b6-20020a170903228600b0019ab4272335mr3769376plh.56.1676711281217; Sat, 18 Feb 2023 01:08:01 -0800 (PST) Received: from localhost.localdomain ([202.53.32.211]) by smtp.gmail.com with ESMTPSA id m192-20020a633fc9000000b004faf33e2758sm3945135pga.40.2023.02.18.01.07.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 01:08:00 -0800 (PST) From: Orlando Chamberlain To: linux-doc@vger.kernel.org, linux-input@vger.kernel.org Cc: Jonathan Corbet , Jiri Kosina , Benjamin Tissoires , 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 , Andy Shevchenko , =?utf-8?q?Thomas_Wei=C3=9Fschu?= =?utf-8?q?h?= Subject: [PATCH v4 2/2] HID: hid-apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards Date: Sat, 18 Feb 2023 20:07:09 +1100 Message-Id: <20230218090709.7467-3-orlandoch.dev@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230218090709.7467-1-orlandoch.dev@gmail.com> References: <20230218090709.7467-1-orlandoch.dev@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758159837392211262?= X-GMAIL-MSGID: =?utf-8?q?1758159837392211262?= This driver adds support for the keyboard backlight on Intel T2 Macs with internal Magic Keyboards (MacBookPro16,x and MacBookAir9,1) Co-developed-by: Kerem Karabay Signed-off-by: Kerem Karabay Signed-off-by: Orlando Chamberlain Reviewed-by: Andy Shevchenko Reviewed-by: Thomas Weißschuh --- v3->v4: - collect reviews from Andy and Thomas - remove now unused hdev member of apple_magic_backlight v2->v3: - remove unneeded inclusion - use s32 for report value type - remove unneeded null check - don't set drvdata as its never used - prepend "hid-" to module name v1->v2: - drop unneeded remove function - combine set functions - add missing header inclusions - avoid char as argument in favour of u8 - handful of style/formatting fixes - use standard led name ":white:kbd_backlight" - rename USAGE_MAGIC_BL to HID_USAGE_MAGIC_BL MAINTAINERS | 6 ++ drivers/hid/Kconfig | 13 +++ drivers/hid/Makefile | 1 + drivers/hid/hid-apple-magic-backlight.c | 120 ++++++++++++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 drivers/hid/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..fe489632bfd9 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 hid-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..dc8df002bc86 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) += hid-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/hid-apple-magic-backlight.c b/drivers/hid/hid-apple-magic-backlight.c new file mode 100644 index 000000000000..f0fc02ff3b2d --- /dev/null +++ b/drivers/hid/hid-apple-magic-backlight.c @@ -0,0 +1,120 @@ +// 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 "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_report *brightness; + struct hid_report *power; +}; + +static void apple_magic_backlight_report_set(struct hid_report *rep, s32 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[0].usage != HID_USAGE_MAGIC_BL) + return -ENODEV; + + backlight = devm_kzalloc(&hdev->dev, sizeof(*backlight), GFP_KERNEL); + if (!backlight) + return -ENOMEM; + + 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->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 = "hid-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");