From patchwork Mon Feb 3 17:02:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 13957854 X-Patchwork-Delegate: jikos@jikos.cz Received: from PNZPR01CU001.outbound.protection.outlook.com (mail-centralindiaazolkn19011033.outbound.protection.outlook.com [52.103.68.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D20CF20D50F; Mon, 3 Feb 2025 17:03:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.68.33 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738602185; cv=fail; b=SsSV0JCcAePs6ONqAw6K9Pb0PWjsWxUmPiByEMnylR4WLdoAFMuXMYvVmSlEQPE/LJuEvAzN6T7vdS79cufXtM80JcnF8dIRG8/VydtAiWZglKqXc+xp1tum3qx8V7mBA/SvWlKxJ6epQ5kblrHckhX4L5d9t/YK5oE6faNSy54= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738602185; c=relaxed/simple; bh=qHd3VxxlhFBnSZTfhCruMFqhdAwZy9WgJgF+lh7YNkQ=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=HpldiFoj4CFJL/MRbsmAbVJdLUclYBGxg+5K9RyKcueDUWB3kq79Cz8sfcXh+DkprUKiObTZra6xAhUIdhayKajd5zXFr9ugfx0FLuXNKjCi7ZsL2jSqfdEYLvB1TUkzyBm367HTrKDpkREpvXqW6uSi7YjoboNxgSQoMCBMHxQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com; spf=pass smtp.mailfrom=live.com; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b=n/cPKrP6; arc=fail smtp.client-ip=52.103.68.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=live.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b="n/cPKrP6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TyO20IWpOmoi48At3/OFJn9hGafkp/3X5/ExaO3oIbnQiKIXlalqPD1dFQxhdGC3DDW2h8N70B3iWSIsxDPiwHc0geWOf+VrFTluZMEvuyNF/DWT+Iy1e/jjjoQ7mKpGShCnJivC1+B2kQhupHALlQqYornzzT1n8mAje06Bw2DEU7bkk+0lyMDb4HJWDugti1563a5IbHc3q+GRbIURCsBk2x7jR9nY/sKiYBEgKxEpbxNdGNuBLh7QLQJTL7X4+AK652LQUXEPrna1xjjndqJK0yhUk2hhvAgtePvuXeg3Bc1osJP+M8LULmvZvZwwRPorMyPZYGWkvUllZOvJwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qHd3VxxlhFBnSZTfhCruMFqhdAwZy9WgJgF+lh7YNkQ=; b=aEZCbJop8rN14TTqO1t9+DtfD8irHdO8Yq/KGNfm3oZCrwCmrpEuCnQqNg0BgxqfS9kjTeK6eVQpR+6oUTdR9ADmRdE65kd30c/etjEyqrm+36wX7A5GX67SADLwQJkUUURugTUKewKMDp2VBfZn5LAQmB1fo3OQnUM9ZwKadsroE0XDTCyv6f58BwDXuXj/5903yW5NgKJHqn+Gn7Je2Eh4xDq+JwATj2G700uTbhTyHw/ivmslWZJ7HilEID7EClMQ3nO+4FO7dXnR3HGp5EKcR02TyLbVYIDT5B72VNYVXSTQ4WKjd1tQyTepB9b0gT2ich/W7EK5FNmFh/sKIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qHd3VxxlhFBnSZTfhCruMFqhdAwZy9WgJgF+lh7YNkQ=; b=n/cPKrP6WWcJ7NgeEgIlMFTPVfDzKZjjdzNscoovX/ZN8qZW+DN2ZoWmFn+fJTAAYxJEKQGEkBklXhTFBx0RXpb0jOt2R2gtriXD6XpPI6DX4jHD+rV+GdXZTUKRrQXZM+4cPqMbr9qbwN9I5LWgR3mFuamqWYG6GupaZfi7qdx7QwyYwHTY0KYhlp1TaXDULx5kMKOfXW4dmBt3UcHHbRNOthUgs8EUO+05ouvaQOV2wVPGEDaOXVRHIQGJRXGMgiHo5CBYLVkynJqkpS00AOEQZIWCh+HGwUBnBaNLwxjZQiAXdpsPA/9wmkRTW7s96GMLSTMLtmAG4JBANc9dbA== Received: from MAZPR01MB8280.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:a7::7) by PN3PR01MB8673.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:d8::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Mon, 3 Feb 2025 17:02:57 +0000 Received: from MAZPR01MB8280.INDPRD01.PROD.OUTLOOK.COM ([fe80::21af:2873:67f3:302b]) by MAZPR01MB8280.INDPRD01.PROD.OUTLOOK.COM ([fe80::21af:2873:67f3:302b%4]) with mapi id 15.20.8398.025; Mon, 3 Feb 2025 17:02:57 +0000 From: Aditya Garg To: Jiri Kosina , "bentiss@kernel.org" , Benjamin Tissoires , =?utf-8?q?Thomas_Wei?= =?utf-8?q?=C3=9Fschuh?= , =?utf-8?q?Thomas_Wei=C3=9Fs?= =?utf-8?q?chuh?= , "jkosina@suse.cz" CC: Kerem Karabay , Orlando Chamberlain , Linux Kernel Mailing List , "linux-input@vger.kernel.org" Subject: [PATCH RESEND v2 1/4] HID: hid-appletb-bl: add driver for the backlight of Apple Touch Bars Thread-Topic: [PATCH RESEND v2 1/4] HID: hid-appletb-bl: add driver for the backlight of Apple Touch Bars Thread-Index: AQHbdl15MruMshSzVU+Wx6zN9cZyrg== Date: Mon, 3 Feb 2025 17:02:57 +0000 Message-ID: <2B5BC9B0-F882-481C-9B09-1FF3978B655D@live.com> References: <5AEC08E1-0AEF-49BF-94F6-AA1AD71545D0@live.com> In-Reply-To: <5AEC08E1-0AEF-49BF-94F6-AA1AD71545D0@live.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MAZPR01MB8280:EE_|PN3PR01MB8673:EE_ x-ms-office365-filtering-correlation-id: 3c57611c-4a9f-4d72-6539-08dd44749b83 x-microsoft-antispam: BCL:0;ARA:14566002|8062599003|461199028|7092599003|15080799006|19110799003|8060799006|102099032|3412199025|440099028|41001999003; x-microsoft-antispam-message-info: =?utf-8?q?4oBEMm5I7l64SO18V0Vo76vE4GwnMnk?= =?utf-8?q?ezbBkh7CzUHeJ1QwUnikLATN01NBu/fmlMyZLoc+qd0ZbyHMLRdqshPEOe7gYR1Rx?= =?utf-8?q?KNMJK7hgEIF0YAMMP2B+mZ3xHQ6q6rDBO2qNPiKmFntWrlklt0eipgfnoWqRrjoV/?= =?utf-8?q?rpnftjqR06lp1vLRuQD0K8KxByg0Lo9dGYzpV95aEISR02f2dcH4jlPPR5AnSGvtO?= =?utf-8?q?m5O2jT/dG/k5emIxm2ywaQeRaJngCw34K5cbUOT3xQ6VeKcurTsCIGYz7Ewis6kON?= =?utf-8?q?oVKDw2K5IWIolTbxvj4v4VnBBw/H/bZzW2WaRJz60jTI3HAfwIukz2Pbj2IE/APBx?= =?utf-8?q?/Drdz64MNPYjrr/1dz9LMx0dBmVUQsJu+vgv74koYWQ+h3ZWskO8nJHIrZDUiMeLX?= =?utf-8?q?LJWR0xhWg/k96NPh4WZ2B5ONZigpXOMGRyZNkfnzIUMnt8EIqn5x212Oy7hpp4vH+?= =?utf-8?q?YOHT8hcVHR8LE4j3CGCkuDjYSFF0KZXS90UJFjJwdQq0jWV2FwgDNK0kPIoDzGUmp?= =?utf-8?q?A9ADARCS1vqIQ3g622Kv26jVaFep9MI7TCpkA33GKJM5m4PtMEeEue2ns0rlTvY/x?= =?utf-8?q?lMc65KRve9OgqVDKdK7ufPdHow7k8w9/OQQLW5hn1BZN5I2u3ETSApfQSqz//tjLQ?= =?utf-8?q?6BPvMpoyrCkGDOSFprDRpCC7ANAJl3b9ywsgT8Oh6TCLJyHUacbVpzd/o3zA5UZ7h?= =?utf-8?q?wm673Ha0rvCFGeABttw+0x1jlbBUnPATwmoRu9i2vFs4dY3VCdInixdBQwmWl/9FR?= =?utf-8?q?LlVc8TGI/v14D3bTzMwy5S/p0krwN3oJC6ZSPTC9d01sz9CRAeWMRXJdwN2v2LN6g?= =?utf-8?q?wriVH0uMGJh3vlF3WEP/pVIiRii7jUi4JLojvKgOVTQ5l2dUFfmD+0IuCFhVuynL1?= =?utf-8?q?sBvsASRut/V6AKjn91aGZnLC5AdBVE5g1A1epsfVWa3rQN+xktRgnBvV/pl1bGSRh?= =?utf-8?q?QDfydNlUgUjxpKxyq6YLSJTf2dVLSQXjItET0ZJUc8ECV6s5FMmyrFyjZxSvVZA3z?= =?utf-8?q?Vm9k9dh/OUcm4Y59wOrD2Mbd7411P1/t7YXJYz27LLRL2VjZRqvncsZTSxTw=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?LG5ivah5KMr4xpB4xD0bTaszXvGA?= =?utf-8?q?e1RYcYIQGrr5vdiurZR0g+ctE8qIGD6sDNEUc4gZUPHvjmWsSLWGCaAgIzf6a67Lb?= =?utf-8?q?ym98QDW4R3wTPaq/1ziURulVJVhbQ4W0vPsW87PZQ/NkkaKsGw95kxKfS5rq/Wnw5?= =?utf-8?q?F/peIPbNuJg86omAVqjIHJ0o3R2JB5JGw087736a7C/KRPQWcgMXVtV2Dion1qmcp?= =?utf-8?q?iUesW6H0XnrJvN/1bMrIl6ez4+MoYeRgKn9VYZiN49x/WxUybg3rTG1DDiOr5C/o7?= =?utf-8?q?Om/PolOpl/KXjRaJXHNgbHp13ud8n18HHlG2jTRN3dRo3eGDdoH9YidvR3bQckedZ?= =?utf-8?q?BOGDPN2qJEqAh580Jll0+voxMUKqYqKN8ZSMpMqrBIR10GzMzYmd7H8bpH4H5XoKt?= =?utf-8?q?FybqO0zdXkYJAh77Nf21TLUSK8R4TrA31x+h2SdD4BKjQhuUxYtsfol3EjdSHmme6?= =?utf-8?q?OE3CoqDnzxYY2T4BYksXjFSYReGs5EbXqXaEbAnBYmJpSUuGipeJ4QUlIY+DdAWoW?= =?utf-8?q?OZL+hC/qwGyBlnb+HxnNzTQ1GsonzX71EGDBNc/dl20quVkGPxSLkZtvGD5fKc9Eu?= =?utf-8?q?O6b8t/6W8iv755uzZ0pG6zfrcvWHmcR+bHUbpTO//VH56NYnbTn+Q5/zS+B+hGhPD?= =?utf-8?q?clZMjXGD6D+H9JVlX86MUxzAHWR/0IcQXd7hhefzZWQaonyD7n+phZShZquiZrrrT?= =?utf-8?q?7Dzq83FTsOTUeYUEGoK01IZCgTMVGpV3boXb5QkJbCyth04HMHTwa+9cxeRl6Yvk5?= =?utf-8?q?ps4CtsMbSk2EqRm0fvrWjtSTjV2SeuvIfq6O/bvd1009EGIdW5+kSQDQqblP/0dzg?= =?utf-8?q?q7YiWfQ33B2oj2DqTfgs7qZYd2H+alAuUal7Qof6Z8IbuLqOImyRf03X+GGEpbQ9t?= =?utf-8?q?+7uTsUGpY4xYzzGw3sPgZoN4cSEYVBemGUBnaFv1znlFOj6HelmYODyKOPUHHaxBb?= =?utf-8?q?RwhSqQe9DjKjwggfDnu51Q2BqLqKsTsZWvEcZuHp2rIeuZE9Xcc9jtfAInx9z3sBI?= =?utf-8?q?tGtjwkV8trEoj6BAPzDYxYzCNOfuFMufLYyqOYb/DoKcmJS3ph+rV91njMaBjQP6M?= =?utf-8?q?KbIzf+VLXohffBRByyk8ou58GmVsaCdZxW5R2JuTuNNa4CKM7n0HJMC+fL+6Stypg?= =?utf-8?q?bWPGUjou5jlErL0BbxIPSfvVd3Qow2ubqiDtzdlERL7YtD8Ao0OupooqE496U=3D?= Content-ID: <1D132347FF922148BA8937E2B5DE9CCB@INDPRD01.PROD.OUTLOOK.COM> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MAZPR01MB8280.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 3c57611c-4a9f-4d72-6539-08dd44749b83 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Feb 2025 17:02:57.1860 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN3PR01MB8673 From: Kerem Karabay This commit adds a driver for the backlight of Apple Touch Bars on x86 Macs. Note that currently only T2 Macs are supported. This driver is based on previous work done by Ronald Tschalär . Signed-off-by: Kerem Karabay Co-developed-by: Aditya Garg Signed-off-by: Aditya Garg --- drivers/hid/Kconfig | 10 ++ drivers/hid/Makefile | 1 + drivers/hid/hid-appletb-bl.c | 207 +++++++++++++++++++++++++++++++++++ drivers/hid/hid-quirks.c | 4 +- 4 files changed, 221 insertions(+), 1 deletion(-) create mode 100644 drivers/hid/hid-appletb-bl.c diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 4d2a89d65..f6678db27 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -148,6 +148,16 @@ config HID_APPLEIR Say Y here if you want support for Apple infrared remote control. +config HID_APPLETB_BL + tristate "Apple Touch Bar Backlight" + depends on BACKLIGHT_CLASS_DEVICE + help + Say Y here if you want support for the backlight of Touch Bars on x86 + MacBook Pros. + + To compile this driver as a module, choose M here: the + module will be called hid-appletb-bl. + config HID_ASUS tristate "Asus" depends on USB_HID diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 24de45f36..444d24cec 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_HID_ALPS) += hid-alps.o obj-$(CONFIG_HID_ACRUX) += hid-axff.o obj-$(CONFIG_HID_APPLE) += hid-apple.o obj-$(CONFIG_HID_APPLEIR) += hid-appleir.o +obj-$(CONFIG_HID_APPLETB_BL) += hid-appletb-bl.o obj-$(CONFIG_HID_CREATIVE_SB0540) += hid-creative-sb0540.o obj-$(CONFIG_HID_ASUS) += hid-asus.o obj-$(CONFIG_HID_AUREAL) += hid-aureal.o diff --git a/drivers/hid/hid-appletb-bl.c b/drivers/hid/hid-appletb-bl.c new file mode 100644 index 000000000..819157686 --- /dev/null +++ b/drivers/hid/hid-appletb-bl.c @@ -0,0 +1,207 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Apple Touch Bar Backlight Driver + * + * Copyright (c) 2017-2018 Ronald Tschalär + * Copyright (c) 2022-2023 Kerem Karabay + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include +#include +#include + +#include "hid-ids.h" + +#define APPLETB_BL_ON 1 +#define APPLETB_BL_DIM 3 +#define APPLETB_BL_OFF 4 + +#define HID_UP_APPLEVENDOR_TB_BL 0xff120000 + +#define HID_VD_APPLE_TB_BRIGHTNESS 0xff120001 +#define HID_USAGE_AUX1 0xff120020 +#define HID_USAGE_BRIGHTNESS 0xff120021 + +static int appletb_bl_def_brightness = 2; +module_param_named(brightness, appletb_bl_def_brightness, int, 0444); +MODULE_PARM_DESC(brightness, "Default brightness:\n" + " 0 - Touchbar is off\n" + " 1 - Dim brightness\n" + " [2] - Full brightness"); + +struct appletb_bl { + struct hid_field *aux1_field, *brightness_field; + struct backlight_device *bdev; + + bool full_on; +}; + +static const u8 appletb_bl_brightness_map[] = { + APPLETB_BL_OFF, + APPLETB_BL_DIM, + APPLETB_BL_ON, +}; + +static int appletb_bl_set_brightness(struct appletb_bl *bl, u8 brightness) +{ + struct hid_report *report = bl->brightness_field->report; + struct hid_device *hdev = report->device; + int ret; + + ret = hid_set_field(bl->aux1_field, 0, 1); + if (ret) { + hid_err(hdev, "Failed to set auxiliary field (%pe)\n", ERR_PTR(ret)); + return ret; + } + + ret = hid_set_field(bl->brightness_field, 0, brightness); + if (ret) { + hid_err(hdev, "Failed to set brightness field (%pe)\n", ERR_PTR(ret)); + return ret; + } + + if (!bl->full_on) { + ret = hid_hw_power(hdev, PM_HINT_FULLON); + if (ret < 0) { + hid_err(hdev, "Device didn't power on (%pe)\n", ERR_PTR(ret)); + return ret; + } + + bl->full_on = true; + } + + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); + + if (brightness == APPLETB_BL_OFF) { + hid_hw_power(hdev, PM_HINT_NORMAL); + bl->full_on = false; + } + + return 0; +} + +static int appletb_bl_update_status(struct backlight_device *bdev) +{ + struct appletb_bl *bl = bl_get_data(bdev); + u8 brightness; + + if (backlight_is_blank(bdev)) + brightness = APPLETB_BL_OFF; + else + brightness = appletb_bl_brightness_map[backlight_get_brightness(bdev)]; + + return appletb_bl_set_brightness(bl, brightness); +} + +static const struct backlight_ops appletb_bl_backlight_ops = { + .options = BL_CORE_SUSPENDRESUME, + .update_status = appletb_bl_update_status, +}; + +static int appletb_bl_probe(struct hid_device *hdev, const struct hid_device_id *id) +{ + struct hid_field *aux1_field, *brightness_field; + struct backlight_properties bl_props = { 0 }; + struct device *dev = &hdev->dev; + struct appletb_bl *bl; + int ret; + + ret = hid_parse(hdev); + if (ret) + return dev_err_probe(dev, ret, "HID parse failed\n"); + + aux1_field = hid_find_field(hdev, HID_FEATURE_REPORT, + HID_VD_APPLE_TB_BRIGHTNESS, HID_USAGE_AUX1); + + brightness_field = hid_find_field(hdev, HID_FEATURE_REPORT, + HID_VD_APPLE_TB_BRIGHTNESS, HID_USAGE_BRIGHTNESS); + + if (!aux1_field || !brightness_field) + return -ENODEV; + + if (aux1_field->report != brightness_field->report) + return dev_err_probe(dev, -ENODEV, "Encountered unexpected report structure\n"); + + bl = devm_kzalloc(dev, sizeof(*bl), GFP_KERNEL); + if (!bl) + return -ENOMEM; + + ret = hid_hw_start(hdev, HID_CONNECT_DRIVER); + if (ret) + return dev_err_probe(dev, ret, "HID hardware start failed\n"); + + ret = hid_hw_open(hdev); + if (ret) { + dev_err_probe(dev, ret, "HID hardware open failed\n"); + goto stop_hw; + } + + bl->aux1_field = aux1_field; + bl->brightness_field = brightness_field; + + if (appletb_bl_def_brightness == 0) + ret = appletb_bl_set_brightness(bl, APPLETB_BL_OFF); + else if (appletb_bl_def_brightness == 1) + ret = appletb_bl_set_brightness(bl, APPLETB_BL_DIM); + else + ret = appletb_bl_set_brightness(bl, APPLETB_BL_ON); + + if (ret) { + dev_err_probe(dev, ret, "Failed to set touch bar brightness to off\n"); + goto close_hw; + } + + bl_props.type = BACKLIGHT_RAW; + bl_props.max_brightness = ARRAY_SIZE(appletb_bl_brightness_map) - 1; + + bl->bdev = devm_backlight_device_register(dev, "appletb_backlight", dev, bl, + &appletb_bl_backlight_ops, &bl_props); + if (IS_ERR(bl->bdev)) { + ret = PTR_ERR(bl->bdev); + dev_err_probe(dev, ret, "Failed to register backlight device\n"); + goto close_hw; + } + + hid_set_drvdata(hdev, bl); + + return 0; + +close_hw: + hid_hw_close(hdev); +stop_hw: + hid_hw_stop(hdev); + + return ret; +} + +static void appletb_bl_remove(struct hid_device *hdev) +{ + struct appletb_bl *bl = hid_get_drvdata(hdev); + + appletb_bl_set_brightness(bl, APPLETB_BL_OFF); + + hid_hw_close(hdev); + hid_hw_stop(hdev); +} + +static const struct hid_device_id appletb_bl_hid_ids[] = { + /* MacBook Pro's 2018, 2019, with T2 chip: iBridge DFR Brightness */ + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, + { } +}; +MODULE_DEVICE_TABLE(hid, appletb_bl_hid_ids); + +static struct hid_driver appletb_bl_hid_driver = { + .name = "hid-appletb-bl", + .id_table = appletb_bl_hid_ids, + .probe = appletb_bl_probe, + .remove = appletb_bl_remove, +}; +module_hid_driver(appletb_bl_hid_driver); + +MODULE_AUTHOR("Ronald Tschalär"); +MODULE_AUTHOR("Kerem Karabay "); +MODULE_DESCRIPTION("MacBookPro Touch Bar Backlight Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index e0bbf0c63..818d41a35 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -328,7 +328,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, #endif #if IS_ENABLED(CONFIG_HID_APPLEIR) @@ -338,6 +337,9 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL5) }, #endif +#if IS_ENABLED(CONFIG_HID_APPLETB_BL) + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, +#endif #if IS_ENABLED(CONFIG_HID_ASUS) { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD) }, { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD) },