From patchwork Thu Aug 8 12:07:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 13757316 Received: from IND01-MAX-obe.outbound.protection.outlook.com (mail-maxind01olkn2029.outbound.protection.outlook.com [40.92.102.29]) (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 C985418C32B; Thu, 8 Aug 2024 12:07:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.92.102.29 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723118854; cv=fail; b=cHYN7cFPhFUboA6xINbukWeIpJ817klZ6JjJyFa8wWZ7bLsY6dbDtOiHWgS0mW4FIZsSEPtE2jgWFblZ9FAWcaqnBJq35cV41J4FggC3FGbDeY+zCr3rQItwRam2p3UfdwAKVAZzS51KNp2CRN9dvjKZ+dZdgJeq93M+so5MD1Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723118854; c=relaxed/simple; bh=Akx0MrXpd+JVj1ZDV4IdDdBaVXlyzdtgQ3clE80/1X4=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=bB0juI1maysrdlZ2b8O7D4e10agsc5ReFZ39iZTU9ejqzZb//p2bokce4sjKGayK3LBSNk0ihNiHChrtbU/YLeCD3UPGdzNeRseihXoNdI7H9iCdoFBnzW7naHx2B2jnYzo7rtEVdKU0n4a2fS0MAPb72xSxHYFCK+hATkf8tC8= 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=sSexBAJ7; arc=fail smtp.client-ip=40.92.102.29 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="sSexBAJ7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JN5hBrVwrBGNUKqhu7vqTNmZ4sRWxH49ATp31uw6hiSYHocJBlFGl5QzS2clijqrlDigtqGEf6I6VUDgxhvAaw3MF2Jt8OK1Wv6SH7WzAtwxAXIASCncN9Hi/vw1Sw70wrhftkACNVk1dMTTEqq8/wB/opPnQh7EL2pcvzLFiDxM6DrscVbFwsWv4olA4Q/Fqs1LQarexWzLQX7WX++PFq+TR0KmVjK03hNACarhfDVkU8jW9a0izjh4yVB9blmntBXOn3xTjsSEsB68YDl9bgzEZpjqFkbCFi7ccrDZUZdwOnGsFaVqytZ0mLsNTsD2FXaBNd39a4Rcw2WkclC+Ng== 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=Akx0MrXpd+JVj1ZDV4IdDdBaVXlyzdtgQ3clE80/1X4=; b=hW69tmMsmxl41Y893qghhIsWKIKSeAhb+4qDTH4BZWaI121I1oIBFYx2EAhaINIH3bnYfBWWSBg1rF2MeN8tY/EI2DcqfblML8j5AlWFLHQmFz4ha1at+5jKNqiJoBL0G3W3/lcB405MjPKr/+l/isp5bezJlpk5dUbpDQNfcqtawW6Bw9kKTjTgv1U+INmFNvIOkbiuyjMrkcbHBFOZOsdFIRL4B3Awq5Ss4KgFAE9FmSNrTlscMAfNQ5tS3c6ZxGaVU3DwsVpI5OywVPWyU4/iHxndFWky66qsvYaPZ3bKbf7zsgHFlumGL7FEb0tY3xoXwmJgONkDUAd9+aiv5g== 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=Akx0MrXpd+JVj1ZDV4IdDdBaVXlyzdtgQ3clE80/1X4=; b=sSexBAJ7nyyUfEFM6L32I6Uvke7ddP7M9vJPJEK2Euh9TVnNbVjJxXKv1jQfI6WmBjUrSrtdil0fPIblXtqvWSGY4G+4ZEg09xovPx6vJWLeUaZ5u/bSUcc8gcaoOoQXsC3jGQgLrEDHQ703CuDwxyUoUfqRps4CF9RKhlW/y1xZFlI/qMskxNuLzHOgJvhhTyBiXxF69AV6/PGhAZr5If5CauKArFmhRJg8DdA/06kNZbHVG9P2CBldt2bWG2fCDoiejSbyUAl+vVEbSkeewbfYAUyi4AhAH9c9VK9QHprFp+KlP8r0F7s6qgokyhT09B1GEqbq/1XmavlvMez4tQ== Received: from MA0P287MB0217.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:b3::9) by PN0P287MB1715.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:18a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14; Thu, 8 Aug 2024 12:07:16 +0000 Received: from MA0P287MB0217.INDP287.PROD.OUTLOOK.COM ([fe80::98d2:3610:b33c:435a]) by MA0P287MB0217.INDP287.PROD.OUTLOOK.COM ([fe80::98d2:3610:b33c:435a%5]) with mapi id 15.20.7849.013; Thu, 8 Aug 2024 12:07:16 +0000 From: Aditya Garg To: "tzimmermann@suse.de" , "maarten.lankhorst@linux.intel.com" , "mripard@kernel.org" , "airlied@gmail.com" , "daniel@ffwll.ch" , Jiri Kosina , "bentiss@kernel.org" CC: Kerem Karabay , Linux Kernel Mailing List , "dri-devel@lists.freedesktop.org" , "linux-input@vger.kernel.org" , Orlando Chamberlain Subject: [PATCH RESEND v2 1/9] HID: hid-appletb-bl: add driver for the backlight of Apple Touch Bars Thread-Topic: [PATCH RESEND v2 1/9] HID: hid-appletb-bl: add driver for the backlight of Apple Touch Bars Thread-Index: AQHa6YuC5IPUsnXZekKbwyV8lGjPIQ== Date: Thu, 8 Aug 2024 12:07:16 +0000 Message-ID: <609161BA-599E-4645-80E5-C698C17CD646@live.com> References: <752D8EEA-EE3B-4854-9B5E-F412AFA20048@live.com> In-Reply-To: <752D8EEA-EE3B-4854-9B5E-F412AFA20048@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-tmn: [A7If//+lIjMaR4xDVvuUYc/d/yD2GhnHS3h+YFjW0AM2apUsNy4KjRrt6D/zOxxTTSMKuINyRDU=] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MA0P287MB0217:EE_|PN0P287MB1715:EE_ x-ms-office365-filtering-correlation-id: f1d50f99-6e69-4087-c116-08dcb7a2a55a x-microsoft-antispam: BCL:0;ARA:14566002|15080799003|461199028|8060799006|19110799003|440099028|3412199025|102099032; x-microsoft-antispam-message-info: B+fzerewJsnAam07YMzvdUVsJ3GBZMo4ms9OAftkuqOKf+Aa+Pv10P78f9zXf+q5s/dM6wAkv7zQDpfLQuVlQ4wL0Ltkdwri4THrpzq7u3YJaHPerJe3I2zG9RTznn9WVL636vmdW20NEC4KVrsvcpXjJ4+Am4i/nbzfbGSf4xSoxEHXtsG8GQTf0YuO99ilrY/tb8sB7cejEWUDzZbJd4NdQb5pCU16fsEbYlDUPJUTaQYf+GWhiQU0t4G3KC5+tCcHzaYy7nEoncT0xBde1++oEvWXJKoEOHUJYanuEKrp878e0GJqsOryL8xBe4X9B41lGA7hWYs/UhJNiF6fz5t0P1AxEd3KMmljLqhqWItRPdKgRAY4UeCwavHvCw/L00vXsBJsVj/QCwSLMrejadqjo8+iMWukSjTbjDxhYBDtq6TU6BEA9Awq6tjiUAO9kro7mCe7qLp1oYrTfUGGiURQ44sNw5L7cNI9O28LMMINRHSj0Kfan/033lNG4IgXX+JkArAW9co77HtPivdIKoWDb3xq+Nb4m81LlpMyDOtQ4l2BBdDGX3je+DeoxHoR8YJd/12UA+mcSW00quNgtSnGbKxJzXGl9tcs5kXuhoHtZ50zDcvOX+qrFSMlq1oFaEcHAZlIMeka0AarIP6Zoh7wZVa+8XhRFgTz9Im0tg//vUB+fRSKKrM6AVOJ2z+Q x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?9Jzx6994DnYN3plh2GLwYneE67or?= =?utf-8?q?X4lBJ/Zx07x5CzUXn+NKtfeWDWE+xKQfmfoCCGA64GHRBwCrJEbhqj+Rk84Xfo65t?= =?utf-8?q?9AtELtlG21pDrVIKFakDqOtmi4F0cGfwTE3Kdq1ZkBv3s/ACan/WXD1RDZ2kP6KNS?= =?utf-8?q?8tLi4IdryCDiOwj+NjTQ8xkjTOJq9LCD6KWjYlgutnm0jFc26FEeCuor0gsfXW/4j?= =?utf-8?q?HiG70wpfTFYiPPDZZIOwQqBBQN6xy4Rd9qtZvXV7OvbP+O8wyVdrA1lzm/vBcUTyj?= =?utf-8?q?1VjA9lX0LKc3YGmgy7XwwjfWgHXOzYiByeqCQHyXWNJgHBeKodQwuNkyzfM8hoIeV?= =?utf-8?q?c6PzpKWulgUb2d+SQ5ArZX4uwoazjN6UdTdbTT2tniZmO17EMv4FQDaWmLzn4BJIP?= =?utf-8?q?i9pCfFXYifdhkPF1CUCTkybEnai0KbdT6DlZomMjwTfw0kTByck/EZe4eWO5o5Pyp?= =?utf-8?q?ip8pzrzv6UohusuCs14Tjz9glcTiCb0g3LPpLw+oOGxuiPVgEVRTMOn9KS5tUJlv3?= =?utf-8?q?TPWt7g5dT/DolT5KyxV7RyFjxnMSw38lacTRhEimOxn6SS8ARVU1UlJPO70NQpiUg?= =?utf-8?q?vmW4T0FHHRWfz4QqZsVUXZEV9Dh4rZD5Pgyo/Jy/ZyScwkZR9pOgJrVCtQaHluCW1?= =?utf-8?q?F3EAfQ/99cd3/xEJOHy8yk5RijYFT33GG+Aej6WeLCwnPChGKYpkFBdq7xbc6MjVF?= =?utf-8?q?LHpC5MIxrx0V+258nKBYaPPEZf+7B0kQE5Tyc/LHePfwfJeSmxhMzktGh5Fw/ZuQf?= =?utf-8?q?uzToTSjhvR2bxXMkUEOEouXP6v/uMp9Cfy+UMQMUby3l+ru0PRNp4H4UfDhnT8bcG?= =?utf-8?q?aBxXDyKTDU7qR1uS2MRzwWq6SL1Tos9niG6LDKn1taVL6sJZO4Ix6oOLcptB9QL5M?= =?utf-8?q?XeZh8aYdcr/h8G5gYfBizRnGgU5E4TdNbfR3KK4z5+wtju6rduC5rqNipoqw8yOMO?= =?utf-8?q?RK0sBmDAzOi5WA1/mc4DZjX9IH/TPCBeCYyIqKCbHIx+FLYoTcOrv3bG3Wj6/SKWH?= =?utf-8?q?lXFIvma7DQ6wSTbxVWdoa1Je6gPZPW7qwuWnhKlipw7uYkA+oazAjkS4y0YEQCXAf?= =?utf-8?q?JBOkWumJG0NmjJJBFKeK3WBPSGR/l0tDiNqxQagt8TqQj+XSxy4jFh7boIS9DbJnr?= =?utf-8?q?JnMnC71j+XCINnLZOXmV1un3GudMVPTFLPjvoN+8gFcSxXAY2QFwvaFSwbR7QeLFJ?= =?utf-8?q?6uOp5E4p6nxczHgfRZYJT7riITpgYqc1/hAF2GR98iPe81H6x2tj2US0QPWg30nGt?= =?utf-8?q?h5eR4DivCJ/5xJ05?= Content-ID: 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-24072.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB0217.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: f1d50f99-6e69-4087-c116-08dcb7a2a55a X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Aug 2024 12:07:16.6160 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN0P287MB1715 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 --- MAINTAINERS | 6 + drivers/hid/Kconfig | 10 ++ drivers/hid/Makefile | 1 + drivers/hid/hid-appletb-bl.c | 206 +++++++++++++++++++++++++++++++++++ drivers/hid/hid-quirks.c | 4 +- 5 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 drivers/hid/hid-appletb-bl.c diff --git a/MAINTAINERS b/MAINTAINERS index 8766f3e5e..ac27f41d4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9931,6 +9931,12 @@ F: include/linux/pm.h F: include/linux/suspend.h F: kernel/power/ +HID APPLE TOUCH BAR DRIVERS +M: Kerem Karabay +L: linux-input@vger.kernel.org +S: Maintained +F: drivers/hid/hid-appletb-* + HID CORE LAYER M: Jiri Kosina M: Benjamin Tissoires diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 08446c89e..4988c1fb2 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 e40f1ddeb..1d825a474 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..00bbe45df --- /dev/null +++ b/drivers/hid/hid-appletb-bl.c @@ -0,0 +1,206 @@ +// 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 "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; +}; + +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); + u16 brightness; + + if (bdev->props.state & BL_CORE_SUSPENDED) + brightness = 0; + else + brightness = backlight_get_brightness(bdev); + + return appletb_bl_set_brightness(bl, appletb_bl_brightness_map[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) },