From 51e3be9885b7d095eb1f7ba8a62ef6771e616e28 Mon Sep 17 00:00:00 2001
From: mexisme <wildjim+dev@kiwinet.org>
Date: Tue, 10 Jan 2023 12:41:58 +1300
Subject: [PATCH] Remove kernel 6.0.11 from MS Surface profile

---
 microsoft/surface/kernel/default.nix          |   1 -
 .../surface/kernel/linux-6.0.11/default.nix   |  38 ------
 .../surface/kernel/linux-6.0.11/patches.nix   | 118 ------------------
 3 files changed, 157 deletions(-)
 delete mode 100644 microsoft/surface/kernel/linux-6.0.11/default.nix
 delete mode 100644 microsoft/surface/kernel/linux-6.0.11/patches.nix

diff --git a/microsoft/surface/kernel/default.nix b/microsoft/surface/kernel/default.nix
index 2b19413..af2a2ba 100644
--- a/microsoft/surface/kernel/default.nix
+++ b/microsoft/surface/kernel/default.nix
@@ -6,7 +6,6 @@ let
 in {
   imports = [
     ./linux-5.19.17
-    ./linux-6.0.11
     ./linux-6.0.17
   ];
 
diff --git a/microsoft/surface/kernel/linux-6.0.11/default.nix b/microsoft/surface/kernel/linux-6.0.11/default.nix
deleted file mode 100644
index 652f241..0000000
--- a/microsoft/surface/kernel/linux-6.0.11/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  inherit (lib) mkIf mkOption types;
-  inherit (pkgs) fetchurl;
-
-  inherit (pkgs.callPackage ../linux-package.nix { }) linuxPackage repos;
-
-  cfg = config.microsoft-surface;
-
-  version = "6.0.11";
-  extraMeta.branch = "6.0";
-  patchDir = repos.linux-surface + "/patches/${extraMeta.branch}";
-  kernelPatches = pkgs.callPackage ./patches.nix {
-    inherit (lib) kernel;
-    inherit version patchDir;
-  };
-
-  kernelPackages = linuxPackage {
-    inherit version extraMeta kernelPatches;
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-      sha256 = "sha256-K65hMeZJceHjT/OV+lQpcRNMhXvbCykGmrhHx8mpx2I=";
-    };
-  };
-
-
-in {
-  options.microsoft-surface.kernelVersion = mkOption {
-    type = types.enum [ "6.0.11" ];
-  };
-
-  config = mkIf (cfg.kernelVersion == "6.0.11") {
-    boot = {
-      inherit kernelPackages;
-    };
-  };
-}
diff --git a/microsoft/surface/kernel/linux-6.0.11/patches.nix b/microsoft/surface/kernel/linux-6.0.11/patches.nix
deleted file mode 100644
index e111c26..0000000
--- a/microsoft/surface/kernel/linux-6.0.11/patches.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{ kernel,
-  patchDir,
-  version,
-}:
-
-[
-  {
-    name = "microsoft-surface-patches-linux-${version}";
-    patch = null;
-    structuredExtraConfig = with kernel; {
-      #
-      # Surface Aggregator Module
-      #
-      CONFIG_SURFACE_AGGREGATOR = module;
-      CONFIG_SURFACE_AGGREGATOR_ERROR_INJECTION = no;
-      CONFIG_SURFACE_AGGREGATOR_BUS = yes;
-      CONFIG_SURFACE_AGGREGATOR_CDEV = module;
-      CONFIG_SURFACE_AGGREGATOR_HUB = module;
-      CONFIG_SURFACE_AGGREGATOR_REGISTRY = module;
-      CONFIG_SURFACE_AGGREGATOR_TABLET_SWITCH = module;
-
-      CONFIG_SURFACE_ACPI_NOTIFY = module;
-      CONFIG_SURFACE_DTX = module;
-      CONFIG_SURFACE_PLATFORM_PROFILE = module;
-
-      CONFIG_SURFACE_HID = module;
-      CONFIG_SURFACE_KBD = module;
-
-      CONFIG_BATTERY_SURFACE = module;
-      CONFIG_CHARGER_SURFACE = module;
-
-      #
-      # Surface Hotplug
-      #
-      CONFIG_SURFACE_HOTPLUG = module;
-
-      #
-      # IPTS touchscreen
-      #
-      # This only enables the user interface for IPTS data.
-      # For the touchscreen to work, you need to install iptsd.
-      #
-      CONFIG_MISC_IPTS = module;
-
-      #
-      # Cameras: IPU3
-      #
-      CONFIG_VIDEO_DW9719 = module;
-      CONFIG_VIDEO_IPU3_IMGU = module;
-      CONFIG_VIDEO_IPU3_CIO2 = module;
-      CONFIG_CIO2_BRIDGE = yes;
-      CONFIG_INTEL_SKL_INT3472 = module;
-      CONFIG_REGULATOR_TPS68470 = module;
-      CONFIG_COMMON_CLK_TPS68470 = module;
-
-      #
-      # Cameras: Sensor drivers
-      #
-      CONFIG_VIDEO_OV5693 = module;
-      CONFIG_VIDEO_OV7251 = module;
-      CONFIG_VIDEO_OV8865 = module;
-
-      #
-      # ALS Sensor for Surface Book 3, Surface Laptop 3, Surface Pro 7
-      #
-      CONFIG_APDS9960 = module;
-
-      #
-      # Other Drivers
-      #
-      CONFIG_INPUT_SOC_BUTTON_ARRAY = module;
-      CONFIG_SURFACE_3_POWER_OPREGION = module;
-      CONFIG_SURFACE_PRO3_BUTTON = module;
-      CONFIG_SURFACE_GPE = module;
-      CONFIG_SURFACE_BOOK1_DGPU_SWITCH = module;
-    };
-  }
-  {
-    name = "ms-surface/0001-surface3-oemb";
-    patch = patchDir + "/0001-surface3-oemb.patch";
-  }
-  {
-    name = "ms-surface/0002-mwifiex";
-    patch = patchDir + "/0002-mwifiex.patch";
-  }
-  {
-    name = "ms-surface/0003-ath10k";
-    patch = patchDir + "/0003-ath10k.patch";
-  }
-  {
-    name = "ms-surface/0004-ipts";
-    patch = patchDir + "/0004-ipts.patch";
-  }
-  {
-    name = "ms-surface/0005-surface-sam";
-    patch = patchDir + "/0005-surface-sam.patch";
-  }
-  {
-    name = "ms-surface/0006-surface-sam-over-hid";
-    patch = patchDir + "/0006-surface-sam-over-hid.patch";
-  }
-  {
-    name = "ms-surface/0007-surface-button";
-    patch = patchDir + "/0007-surface-button.patch";
-  }
-  {
-    name = "ms-surface/0008-surface-typecover";
-    patch = patchDir + "/0008-surface-typecover.patch";
-  }
-  {
-    name = "ms-surface/0009-cameras";
-    patch = patchDir + "/0009-cameras.patch";
-  }
-  # {
-  #   name = "ms-surface/0010-amd-gpio";
-  #   patch = patchDir + "/0010-amd-gpio.patch";
-  # }
-]