Merge pull request #341 from mitchmindtree/xps-9310-rm-kernel-patches
xps-9310: Remove upstreamed kernel patches with custom config
This commit is contained in:
commit
4c9f07277b
|
@ -4,26 +4,13 @@
|
|||
../../../common/pc/laptop
|
||||
../../../common/pc/ssd
|
||||
];
|
||||
|
||||
|
||||
|
||||
# Includes the Wi-Fi and Bluetooth firmware for the QCA6390.
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
|
||||
# Requires at least 5.12 for working wi-fi and bluetooth.
|
||||
boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.12") (lib.mkDefault pkgs.linuxPackages_latest);
|
||||
# TODO: upstream this to NixOS
|
||||
boot.kernelPatches = [{
|
||||
name = "enable-qca6390-bluetooth";
|
||||
patch = null;
|
||||
extraConfig = ''
|
||||
BT_QCA m
|
||||
BT_HCIUART m
|
||||
BT_HCIUART_QCA y
|
||||
BT_HCIUART_SERDEV y
|
||||
SERIAL_DEV_BUS y
|
||||
SERIAL_DEV_CTRL_TTYPORT y
|
||||
'';
|
||||
}];
|
||||
boot.kernelModules = [ "btqca" "hci_qca" "hci_uart" ];
|
||||
|
||||
# Touchpad goes over i2c.
|
||||
# Without this we get errors in dmesg on boot and hangs when shutting down.
|
||||
|
|
Loading…
Reference in a new issue