diff --git a/packages/linux-lava/dsd_um3402yar.patch b/packages/linux-lava/dsd_um3402yar.patch deleted file mode 100644 index 27a13a9..0000000 --- a/packages/linux-lava/dsd_um3402yar.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c -index 2eca5822055..503f3b889f1 100644 ---- a/sound/pci/hda/cs35l41_hda_property.c -+++ b/sound/pci/hda/cs35l41_hda_property.c -@@ -54,6 +54,7 @@ - { "10431533", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, - { "10431573", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 }, - { "10431663", SPI, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 1000, 4500, 24 }, -+ { "10431683", I2C, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 }, - { "104316D3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, - { "104316F3", SPI, 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, - { "104317F3", I2C, 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, -@@ -358,6 +359,7 @@ - { "CSC3551", "10431533", generic_dsd_config }, - { "CSC3551", "10431573", generic_dsd_config }, - { "CSC3551", "10431663", generic_dsd_config }, -+ { "CSC3551", "10431683", generic_dsd_config }, - { "CSC3551", "104316D3", generic_dsd_config }, - { "CSC3551", "104316F3", generic_dsd_config }, - { "CSC3551", "104317F3", generic_dsd_config }, diff --git a/packages/linux-lava/sources.nix b/packages/linux-lava/sources.nix index c6f501c..dd40119 100644 --- a/packages/linux-lava/sources.nix +++ b/packages/linux-lava/sources.nix @@ -1,8 +1,8 @@ { fetchFromGitHub, inputs, lib }: let - version = "6.7.0"; - kernelHash = "0s8hbcsg7fdvspqam8kzcxygjsznr4zfi60nqgc81l3n4m518cgg"; - kernelPatchHash = "1qnial7m91l3amcsgms3cs599pi529kvda1c982qk45s39y029xj"; + version = "6.9.3"; + kernelHash = "0jc14s7z2581qgd82lww25p7c4w72scpf49z8ll3wylwk3xh3yi4"; + kernelPatchHash = "1lzkpyp41175kf672s92bz7wzx0favy5xdmxpsgzl9s3z6hdyb7q"; mm = lib.versions.majorMinor version; tkgPatches = [ @@ -11,6 +11,7 @@ let "0003-glitched-eevdf-additions" "0003-glitched-cfs" "0007-v${mm}-fsync1_via_futex_waitv" + "0007-v${mm}-ntsync" # "0007-v${mm}-winesync" fails to patch "0012-misc-additions" ]; @@ -35,13 +36,11 @@ in { }; kernelPatches = [ - #kernelPatchSrc - (patch ./dsd_um3402yar.patch) + kernelPatchSrc ] ++ builtins.map (name: { inherit name; patch = "${inputs.linux-tkg}/linux-tkg-patches/${mm}/${name}.patch"; }) tkgPatches - ++ [ - ]; + ++ [ ]; }