linux-asahi: asahi-6.8.10-4 -> asahi-6.9.9-5

Update for latest config.

Remove now in-tree speaker enablement patches.

apple-silicon-support/packages/linux-asahi/config

@@ -516,7 +516,7 @@ CONFIG_DMI=y
 #
 # Power management options
 #
-# CONFIG_SUSPEND is not set
+CONFIG_SUSPEND=y
 # CONFIG_HIBERNATION is not set
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
@@ -7790,42 +7790,33 @@ CONFIG_UCLAMP_BUCKETS_COUNT=5
 
 # Fedora Asahi Remix-specific options
 # generated with something like
-# git diff --name-only fedora-6.6 fedora-asahi-6.6 redhat/configs/ | xargs cat >> config
-# in a checkout of https://gitlab.com/fedora-asahi/kernel-asahi/-/tree/fedora-asahi-6.6
+# git diff --name-only fedora-6.9 fedora-asahi-6.9 redhat/configs/ | grep -v x86 | grep -v s390x | xargs cat | sort >> config
+# in a checkout of https://gitlab.com/fedora-asahi/kernel-asahi/-/tree/fedora-asahi-6.9
 
-CONFIG_SUSPEND=y
-# CONFIG_APPLE_PLATFORMS is not set
-# CONFIG_DRM_SIMPLEDRM_BACKLIGHT is not set
-CONFIG_RUST=y
-# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
-# CONFIG_RUST_DEBUG_ASSERTIONS is not set
-# CONFIG_RUST_EXTRA_LOCKDEP is not set
-CONFIG_RUST_OVERFLOW_CHECKS=y
-# CONFIG_SPI_HID_APPLE_OF is not set
-# CONFIG_USB_XHCI_PCI_ASMEDIA is not set
-CONFIG_APPLE_MAILBOX=y
-# CONFIG_APPLE_PMGR_MISC is not set
-CONFIG_ARM64_MEMORY_MODEL_CONTROL=y
-# CONFIG_ARM_APPLE_CPUIDLE is not set
-# CONFIG_SND_SOC_CS42L84 is not set
-CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_USB_XHCI_PCI_ASMEDIA=y
-CONFIG_SND_SOC_CS42L84=m
-CONFIG_TOUCHSCREEN_APPLE_Z2=m
 CONFIG_APPLE_DOCKCHANNEL=m
+CONFIG_APPLE_MAILBOX=y
+# CONFIG_APPLE_PLATFORMS is not set
 CONFIG_APPLE_PLATFORMS=y
+# CONFIG_APPLE_PMGR_MISC is not set
 CONFIG_APPLE_PMGR_MISC=y
-CONFIG_APPLE_RTKIT=y
 CONFIG_APPLE_RTKIT_HELPER=m
+CONFIG_APPLE_RTKIT=y
+CONFIG_APPLE_SIO=m
 CONFIG_APPLE_SMC=m
 CONFIG_APPLE_SMC_RTKIT=m
+CONFIG_ARM64_MEMORY_MODEL_CONTROL=y
+# CONFIG_ARM_APPLE_CPUIDLE is not set
 CONFIG_ARM_APPLE_CPUIDLE=y
+# CONFIG_AX88796B_RUST_PHY is not set
 CONFIG_CHARGER_MACSMC=m
 CONFIG_DRM_ADP=m
-CONFIG_DRM_APPLE=m
 CONFIG_DRM_APPLE_AUDIO=y
-CONFIG_DRM_ASAHI=m
+# CONFIG_DRM_APPLE_DEBUG is not set
+CONFIG_DRM_APPLE=m
 # CONFIG_DRM_ASAHI_DEBUG_ALLOCATOR is not set
+CONFIG_DRM_ASAHI=m
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+# CONFIG_DRM_SIMPLEDRM_BACKLIGHT is not set
 CONFIG_GPIO_MACSMC=m
 CONFIG_HID_DOCKCHANNEL=m
 CONFIG_INPUT_MACSMC_HID=m
@@ -7836,11 +7827,23 @@ CONFIG_PHY_APPLE_ATC=m
 CONFIG_PHY_APPLE_DPTX=m
 CONFIG_POWER_RESET_MACSMC=m
 CONFIG_RTC_DRV_MACSMC=m
+# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
+# CONFIG_RUST_DEBUG_ASSERTIONS is not set
+# CONFIG_RUST_EXTRA_LOCKDEP is not set
+CONFIG_RUST_OVERFLOW_CHECKS=y
+CONFIG_RUST_PHYLIB_ABSTRACTIONS=y
+CONFIG_RUST=y
+CONFIG_SENSORS_MACSMC=m
 CONFIG_SND_SOC_APPLE_MACAUDIO=m
 CONFIG_SND_SOC_APPLE_SILICON=m
+CONFIG_SND_SOC_CS42L84=m
 CONFIG_SPI_APPLE=m
+# CONFIG_SPI_HID_APPLE_OF is not set
 CONFIG_SPI_HID_APPLE_OF=m
 CONFIG_SPMI_APPLE=m
+CONFIG_TOUCHSCREEN_APPLE_Z2=m
+# CONFIG_USB_SERIAL_F81232 is not set
+CONFIG_USB_SERIAL_F81232=m
+# CONFIG_USB_XHCI_PCI_ASMEDIA is not set
+CONFIG_USB_XHCI_PCI_ASMEDIA=y
 CONFIG_VIDEO_APPLE_ISP=m
-CONFIG_SND_SOC_CS42L84=m
-CONFIG_APPLE_SIO=m

apple-silicon-support/packages/linux-asahi/default.nix

@@ -86,36 +86,22 @@ let
     (linuxKernel.manualConfig rec {
       inherit stdenv lib;
 
-      version = "6.8.10-asahi";
+      version = "6.9.9-asahi";
       modDirVersion = version;
-      extraMeta.branch = "6.8";
+      extraMeta.branch = "6.9";
 
       src = fetchFromGitHub {
         # tracking: https://github.com/AsahiLinux/linux/tree/asahi-wip (w/ fedora verification)
         owner = "AsahiLinux";
         repo = "linux";
-        rev = "asahi-6.8.10-4";
-        hash = "sha256-/UknEMf4awGcb1Pf2YiCfowPv/oIx0zAGNJm0wp1qgA=";
+        rev = "asahi-6.9.9-5";
+        hash = "sha256-l3VH38tqzCHLRYOj0jtKsIsBnqwXqKsA4g+4lEC11lQ=";
       };
 
       kernelPatches = [
         { name = "coreutils-fix";
           patch = ./0001-fs-fcntl-accept-more-values-as-F_DUPFD_CLOEXEC-args.patch;
         }
-        # speaker enablement; we assert on the relevant lsp-plugins patch
-        # before installing speakersafetyd to let the speakers work
-        { name = "speakers-1";
-          patch = fetchpatch {
-            url = "https://github.com/AsahiLinux/linux/commit/385ea7b5023486aba7919cec8b6b3f6a843a1013.patch";
-            hash = "sha256-u7IzhJbUgBPfhJXAcpHw1I6OPzPHc1UKYjH91Ep3QHQ=";
-          };
-        }
-        { name = "speakers-2";
-          patch = fetchpatch {
-            url = "https://github.com/AsahiLinux/linux/commit/6a24102c06c95951ab992e2d41336cc6d4bfdf23.patch";
-            hash = "sha256-wn5x2hN42/kCp/XHBvLWeNLfwlOBB+T6UeeMt2tSg3o=";
-          };
-        }
       ] ++ _kernelPatches;
 
       inherit configfile;