From patchwork Thu Aug 8 13:50:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 13757489 Received: from IND01-BMX-obe.outbound.protection.outlook.com (mail-bmxind01olkn2030.outbound.protection.outlook.com [40.92.103.30]) (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 C1B2963D; Thu, 8 Aug 2024 13:50:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.92.103.30 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723125046; cv=fail; b=ltsdpVr2dfjmG0+Z2uyeMfWl/foCMHQEAn2GyBXo6kDnbGrT04l/NhdNq218ZVANzwmEILl+WkC+EsHtmZP8oLS2z7qmUq3w+hoLx9RK/A6KNN+hWT373YZFSMOtL93FjRSNyTORLJFWemXnxSsL5Dz6xSR2genu1pXoJGpAmbI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723125046; c=relaxed/simple; bh=7EKteogOeesyTzxaV4DfyZtFTiETS7hlG3rkW/szOU4=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=Gv/XAt1QTA7br9CPHMgT8H83Q7a4AV/mdxohWts72c5wQSZmxO3Zvbicwoen/ntjYr+ZylrbOGWz/OJt0JYwn8e6ks5AU/J5zEaIExO+3nCkEmgP2i1xprKxz3T//bH/qmkoQBKCjKWMAA0Er02qvVW/yBp/2gPnkuGpxXPyypk= 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=al+nPGUr; arc=fail smtp.client-ip=40.92.103.30 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="al+nPGUr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=u0b+QhJLbzUjkJC9useQncxFyARKD0fmqOclqzqKBxt1Dixb9Ag4JKMnQrWPzYXAfUeb9d8v5fYrYImu20CcQHO62tiykOY2ZYLQDsTiFt1N5roIdl4zPiBiQXQqpDG5K4FmhxYY8CRmRt1YQcwLqdD6h4hBCmkReQMNlA9GWoTUESazZPuGvjfvaOSxV/dMaUUr0dSldaBc6T+99O/m05YnR/EdZ/Or4jHmHQhT77stnLVjU/Oz0QRq/dp571GnnaMOGdtKXOv9N0wbkqVCN5uWdNfPRQOZm9Sv1HYnAGbSfBreA6cmH640KL4YPqsHx7UyvH3vKR/IcIhO1dr+bg== 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=7EKteogOeesyTzxaV4DfyZtFTiETS7hlG3rkW/szOU4=; b=SwkyiRdIsOoRWbazKdhlOGQe5u+BET8OZJqZepvje57wkMyiwSThFpb/FYz18u/NEZ3EZsX9WbXvLgTdZKjAuLqMpwcB2OSahDxdMCy0GqEDPs2982Xttd5G16O+w/ogwngO/14zWTWnQpaRXjIwoW3guUkvV1r4DlxRql9Qy9xWUmymNSeeLmqtoqSitrO6UaD97hv9NKndPEjHpCSbtciA5T7jJeT0mNcI6hcTADCeE2Y7GTxjwzpPiWZIW5V2BgwYPhjGPf2IuVd8V3tHL4qSJooMcm3dW1tDrbV8a/6C/Ct2aU4dhJ8gVPfjRm20tPGyxCYPH1V+fwp7tRa0vg== 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=7EKteogOeesyTzxaV4DfyZtFTiETS7hlG3rkW/szOU4=; b=al+nPGUrqnJeMTgY20L1IJhQ0yJ8ZBQg4jN4IDJNaVDQXAVkt5KgfbjZYMMkHrJyIcjU5d0jQx3n4FylNwPU2ztC9xJk43oydv8KjHYGSX4Yl5Bc3YHaKLJ/OModda8KNSPsEj+xwoY68o9kusyzGUKkFvfD6J77eg8knvt+w5vKgv0R7YdOWxWGY551cLDzWPI6TftqaTarKfrFucutz0STfolF6XYUISqUzs/1e0aewfuLPHAS6ipD3lMMNRstEobVmCuKsuciPp7P5yuHVoqC0xHLfAlAGdgfCs+ED1Cy55/24XgwOTxnQpvsHufUCUu9AWiGADXcUmA7In6djQ== Received: from MA0P287MB0217.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:b3::9) by MA0P287MB1976.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:11f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.13; Thu, 8 Aug 2024 13:50:33 +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 13:50:33 +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: Orlando Chamberlain , Kerem Karabay , Linux Kernel Mailing List , "linux-input@vger.kernel.org" , "dri-devel@lists.freedesktop.org" Subject: [PATCH v3 1/9] HID: hid-appletb-bl: add driver for the backlight of Apple Touch Bars Thread-Topic: [PATCH v3 1/9] HID: hid-appletb-bl: add driver for the backlight of Apple Touch Bars Thread-Index: AQHa6ZnwG/WxED5nkkyW2eoHr7dbGQ== Date: Thu, 8 Aug 2024 13:50:33 +0000 Message-ID: <0DDD5C22-A42A-49F2-984C-F3595F71AB1C@live.com> References: <1368FEE8-58BB-41C9-B9AD-7F2F68FF1D53@live.com> In-Reply-To: <1368FEE8-58BB-41C9-B9AD-7F2F68FF1D53@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: [ODLIA49k0W1Ax7ER/adytdG/QSwV/OXEazj5r9KAIjxT1d96d3z6mHeW4EY0VVxzxg1bRY2i3uI=] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MA0P287MB0217:EE_|MA0P287MB1976:EE_ x-ms-office365-filtering-correlation-id: 4244a65c-2058-46d8-3fd5-08dcb7b112e5 x-microsoft-antispam: BCL:0;ARA:14566002|461199028|15080799003|8060799006|19110799003|102099032|3412199025|440099028; x-microsoft-antispam-message-info: h4DenrEdIS/Txh8P7dUTLhQ3fq2pdXTJwQGMac+SmlzaGQ5Ks4/EzKLReyv/bbjF4gCrBZakrkH9K/kO/yDW5JQInYYvEriX3A9OWupeGxy8fTPz4p6+UMaE9FDgxTGmzyY3Pp3on6qZDAFT89YiWX09aBY5Z87U+DVrzaD1odI+sDGxwedNqFrA2AUDaNnnZ35Xa84g4Ik+PYST79w69m19ZQi3E4vgPP5jUqFFeYj8pORKM0sn1iMiwiM6AjWghB6aeWrDcK9sYQrD0N8VoLPE5JzcWR3RqyIelELO2ljDvcc8a3oHsL2O1r/QAJpJpzCxPf8x8zejhWSBXpMQyLcr13J52dJVZP/9LVRMQB6aorAd9Dhw1GaP7p6DoPu1Mwz32U6xxX2r+I/zy3CJb2dfQnMsH080f49MeKOak/EhzV2SuwBJAVp/Js/c36UskPL9CwRW5DU9OSPLDudy+UXPTmnjXX3j7bVYhrih3g5R4OzJ9othc73RFlFZFsz2xJeJvLlpGM4YMDnNem+lg7gJLVF1KFwAabsl7nbgA5vgUFksYmd2ORYXy3867v89sINr0vM7np9q2t3cOotXYoxvZ2COkshDSqhaana/Otrs4i03R6usGYZkntws8eEU6fY/yqq2q9kwuZotyqBHO6Fb7StDtH7Ef5D64IQ4Ezy+Vhq5oGwuEBGS6lBbhsul x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?Z8m0DwdwgA/9gXm2G9dnl+rCf42q?= =?utf-8?q?EXMTNeX2LeR2uRLuG1QSGi0MH5wgsc+NW13aykkF2NCPkrtX1gehoemgQQkru56fR?= =?utf-8?q?bA5jxbgd2uPxKw+sXPYJSKz3w2Q2hI49e8aporF/OcrBJIvIIASwMqE1a+VZCfxbL?= =?utf-8?q?U+R/Rgd/HStANi9FGUGcAzwBGRq/mvP26S548Cbb6BmIEaikzKtMygnYXB/SEV/4e?= =?utf-8?q?EY+QAPAWkD2CBl87FfmzmwtFg3ooqrRKOKNxOjQng51ncVHMr9yK5eaGf7LVYFG6K?= =?utf-8?q?l5VvaD3oWGQAuSjV+Udqx11H2/Rft6Uu8L9U7Ag7GJ+Lm3CwGvZcrbLxWrCf+u+fR?= =?utf-8?q?0Dz4rEuBwRCaMJrKLOCdfdIIvdL1xurc9GEFZPr3V6a/Awg3getOOJ8f28mAyf3cF?= =?utf-8?q?cfVzVbM21t2UteWmf3yHSqVXFrkMBvlU0R5yT6QyDcttN3mwsWIQOWwA/SO8iCj3c?= =?utf-8?q?/IGtI732b7HS4AZtLF8TD3Qsn7uumSPg9bRPK0Ij9EqrQxkeUQuzxpm80cBtSnW7r?= =?utf-8?q?3yGy+6ZCdGQa0W73B7BxtOOpPqFWPWwaKhzmDfxHbjdb5g4ZqSThikZ8B5R+P6AKB?= =?utf-8?q?JYRawUZwU3Z3bU+m+0s2qYi42pfmpOe1UPR1eWrKXYEtZrXVaLHkZuUTgRz01JNFE?= =?utf-8?q?anZ26nJPotK+nA4CwV+lcB8dfZD/KhlamwAsh9/LFSLK7DYb/gEQbbI2Jsi7yS3Xr?= =?utf-8?q?68cuhrpZU7BB8i09S+rxNTSuAsdGfqdN/aDmOYlN+jpwJnQGD3iltoYNBPZtXoSDD?= =?utf-8?q?GvF4h2IFGju6IQbyrNbCcAWRhkig667rdCTFk2OHxlaVRzb3SXci1HQwpS7VVb5Rf?= =?utf-8?q?V2dDaAxvXoIkfyIEYuvrxke6/v+2Wh7yxOL4vnT0L/ZmdUaSFiaiWGGfxlBj9vRA+?= =?utf-8?q?mlxYCMs8hB2ONK88Sq7p1JmicDzGS4GgHzs78FLutXwj/LRmq5pIOZ4eXFz1lZD5f?= =?utf-8?q?BfM1f5xNazeTfH5amKo9ZytzVBTChrcBLG9KaJaE0wxfcd3Wa2LvhrNnwFfAeEdWt?= =?utf-8?q?DD2Wsc/L2ZjxqZ8Hp3KTwWJJVO9RwUhBjFG7dEW3hAzg4AWwhSLWzhRidmMsvg11w?= =?utf-8?q?2KZh585D48oEl5xg1mjzUfqcSmo1zqMEb6PFkJ9l25OtM6pQCf4bGzF64NHCho92d?= =?utf-8?q?397HyBW6ihTZkY8Ka07O9MOOCIa5Akr/EJ1B06HXV9cS36Bt9g8fxSB2kzNhLOaAT?= =?utf-8?q?mq/rdsaPI7E9m0p/ovB4C5besXEQs2Kjz1Mgknc7uhmd/Q2nUOcwRjzuLRHH8pPvF?= =?utf-8?q?s+4AYqFFz8Rpqk3Z?= Content-ID: <35ECDD841152E74E890933E13F5D3D71@INDP287.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-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: 4244a65c-2058-46d8-3fd5-08dcb7b112e5 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Aug 2024 13:50:33.3639 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0P287MB1976 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) },