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 38E95C636D7 for ; Thu, 16 Feb 2023 07:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229677AbjBPHLE (ORCPT ); Thu, 16 Feb 2023 02:11:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229502AbjBPHLB (ORCPT ); Thu, 16 Feb 2023 02:11:01 -0500 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FCFA27D7F; Wed, 15 Feb 2023 23:11:00 -0800 (PST) Received: by mail-pj1-x102c.google.com with SMTP id mg23so1059466pjb.0; Wed, 15 Feb 2023 23:11:00 -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:subject:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=JEpZD+CHsAwztPW16N+o6srsm2/QbJ/Y4/xSr2j8z+c=; b=SWmokZ7pthFFaXLIWoeiGEqIJTZi2trT0tAieWxth5HIG0uD0G/ZCrrDiMz4ZDUCqS EynGT6sPDzwoXpbyWkPMhtiirJW+ucjVS+GmLQ+MEqdQx7g7rqPeuTiRHPrX6tnGVmk0 XtrCGNM8bO4Bml1vKjgkfs4wTNy+nZKoohJ3Lnb8et5KJJ9lsfV9hcpIdp608BsehfKy OdlSgjgxS6LGzkFRvO6b7/wzr0zYYJqUi4MG+3t1+dDYDsLOIPOM02jhB+msDp5a8uM+ 4sLs+s1OOT/r6bSOk7rci8bXfQ6jVB8O1jYTbQN18hfhEN8qkI8ViPaw2V6YQR2unjk7 tPLQ== 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:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JEpZD+CHsAwztPW16N+o6srsm2/QbJ/Y4/xSr2j8z+c=; b=GSzh28ubVJZWVMwYAUEm1Ds1aCqArqZsqatIc5dTJKzMexJ1gR7sOGuSrt+5riJAeL WDCXXTDCEnUJ9qK9+NLkM+i5JCp9CpD89npeXegsiHPz+/gF8oVitNyiPwoMPm1bh8t6 kTnnbCDcqEI+uTvdtotRS5rODHRNRRDHNTmkIq8uWOzmAE7FUdDljukZI8X5FmsszUAA xjY9MnhXDUPwUcaMrd8KJwtE8T+Y9V9CzveW7t746frbpGTIRCSRAhuNPD+VuvzIvLwn a2kB5LULRBtRvTSUDzHLy72hQFERRHjEpAF1/C7TNgZPvfRRKO255fHWYn28PFV15wyI xzgA== X-Gm-Message-State: AO0yUKWS292YEnVZsLwbAz7Y7+h6P8YAlC+BQ8N4Sa9/7CYRJkRynTOE c0I1otxFz/aWaFIDmFHfO15BFwygzowe7g== X-Google-Smtp-Source: AK7set87WQ6chGHyHGTgR5zUhp6jJBXsL+kOp3nn/NOkS5VS3P45sSiOJj7m8EbP4WSQxYTeEfOx0w== X-Received: by 2002:a17:902:da8b:b0:19a:f02c:a05b with SMTP id j11-20020a170902da8b00b0019af02ca05bmr1087586plx.3.1676531459810; Wed, 15 Feb 2023 23:10:59 -0800 (PST) Received: from redecorated-mbp ([202.53.32.211]) by smtp.gmail.com with ESMTPSA id jb6-20020a170903258600b0019a7563ff15sm531673plb.115.2023.02.15.23.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 23:10:59 -0800 (PST) Date: Thu, 16 Feb 2023 18:10:50 +1100 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 , Thomas =?UTF-8?B?V2Vpw59zY2h1aA==?= Subject: Re: [PATCH 2/2] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards Message-ID: <20230216181050.52a31247@redecorated-mbp> In-Reply-To: <20230216041224.4731-3-orlandoch.dev@gmail.com> References: <20230216041224.4731-1-orlandoch.dev@gmail.com> <20230216041224.4731-3-orlandoch.dev@gmail.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.35; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 16 Feb 2023 15:12:28 +1100 Orlando Chamberlain wrote: > 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 A general question to the hid/input folks: Is it alright that this doesn't start with "hid-"? All the other drivers start with that so I'm not sure if its an issue. If it is, then I can rename it to "hid-apple-magic-backlight". > ++++++++++++++++++++++++++++ 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");