From 2629d549d53d97ff37b74e53cae97f366d029f5c Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 6 Oct 2025 13:02:30 +0800 Subject: [PATCH] Revert "modules.system.kernel: add btusb patch" This reverts commit 05ab5100ebc3ff903fdd3cf7c4313ce78f6e14e3. --- devices/pc/default.nix | 2 +- modules/system/kernel/btusb.patch | 74 ------------------------------- modules/system/kernel/default.nix | 1 - 3 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 modules/system/kernel/btusb.patch diff --git a/devices/pc/default.nix b/devices/pc/default.nix index 25b0df77..5f25730c 100644 --- a/devices/pc/default.nix +++ b/devices/pc/default.nix @@ -34,7 +34,7 @@ inputs: ]; nixpkgs = { march = "znver5"; rocm = true; }; sysctl.laptop-mode = 5; - kernel = { variant = "cachyos"; patches = [ "btusb" ]; }; + kernel.variant = "cachyos"; }; hardware = { gpu.type = "amd"; asus = {};}; services = diff --git a/modules/system/kernel/btusb.patch b/modules/system/kernel/btusb.patch deleted file mode 100644 index 543016c8..00000000 --- a/modules/system/kernel/btusb.patch +++ /dev/null @@ -1,74 +0,0 @@ -Message-Id: <20250606-btusb-mt7925-add-v1-1-9b64bfa86ea4@hexchain.org> -Date: Fri, 06 Jun 2025 23:33:03 +0800 -From: Haochen Tong via B4 Relay -To: Marcel Holtmann , - Luiz Augusto von Dentz -Cc: linux-bluetooth@...r.kernel.org, linux-kernel@...r.kernel.org -Subject: [PATCH] Bluetooth: btusb: Add a new VID/PID 2c7c/7009 for MT7925 - -From: Haochen Tong - -Adds a new entry with VID 2c7c and PID 7009 for MediaTek MT7925 -Bluetooth chip. - -The device information from /sys/kernel/debug/usb/devices is provided -below. - -T: Bus=03 Lev=01 Prnt=01 Port=04 Cnt=02 Dev#= 3 Spd=480 MxCh= 0 -D: Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 -P: Vendor=2c7c ProdID=7009 Rev= 1.00 -S: Manufacturer=MediaTek Inc. -S: Product=Wireless_Device -S: SerialNumber=000000000 -C:* #Ifs= 3 Cfg#= 1 Atr=e0 MxPwr=100mA -A: FirstIf#= 0 IfCount= 3 Cls=e0(wlcon) Sub=01 Prot=01 -I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=125us -E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms -I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms -I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms -I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms -I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms -I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms -I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms -I: If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms -I:* If#= 2 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none) -E: Ad=8a(I) Atr=03(Int.) MxPS= 64 Ivl=125us -E: Ad=0a(O) Atr=03(Int.) MxPS= 64 Ivl=125us -I: If#= 2 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=(none) -E: Ad=8a(I) Atr=03(Int.) MxPS= 512 Ivl=125us -E: Ad=0a(O) Atr=03(Int.) MxPS= 512 Ivl=125us - -Signed-off-by: Haochen Tong ---- - drivers/bluetooth/btusb.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 9ab661d2d1e69028061fa3accd5106f481094100..e4a45596762f8c7d8ba10b4107d6e6f2203188e2 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -725,6 +725,8 @@ static const struct usb_device_id quirks_table[] = { - BTUSB_WIDEBAND_SPEECH }, - { USB_DEVICE(0x13d3, 0x3630), .driver_info = BTUSB_MEDIATEK | - BTUSB_WIDEBAND_SPEECH }, -+ { USB_DEVICE(0x2c7c, 0x7009), .driver_info = BTUSB_MEDIATEK | -+ BTUSB_WIDEBAND_SPEECH }, - - /* Additional Realtek 8723AE Bluetooth devices */ - { USB_DEVICE(0x0930, 0x021d), .driver_info = BTUSB_REALTEK }, diff --git a/modules/system/kernel/default.nix b/modules/system/kernel/default.nix index ccfc9e7c..bc73f30e 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel/default.nix @@ -76,7 +76,6 @@ inputs: }; structuredExtraConfig.BTRFS_EXPERIMENTAL = inputs.lib.kernel.yes; }]; - btusb = [{ name = "btusb"; patch = ./btusb.patch; }]; }; in builtins.concatLists (builtins.map (name: patches.${name}) kernel.patches); };