Merge bc68d15667 into 52113c4f5c

Merge pull request #1668 from concatime/fix/rename-modules
Rename some modules to their correct names
2025-11-09 16:16:21 +01:00 · 2025-11-07 08:29:58 -05:00 · 2025-11-06 21:07:11 +00:00 · 2025-11-06 15:05:04 -05:00 · 2025-11-06 15:05:04 -05:00 · 2025-08-29 13:20:56 +01:00
7 changed files with 44 additions and 32 deletions
--- a/dell/precision/7520/default.nix
+++ b/dell/precision/7520/default.nix
@ -15,7 +15,7 @@
  boot.initrd.availableKernelModules = [
    "xhci_pci"
    "ahci"
-    "usb_storage"
+    "usb-storage"
    "sd_mod"
    "rtsx_pci_sdmmc"
  ];
--- a/focus/m2/gen1/default.nix
+++ b/focus/m2/gen1/default.nix
@ -13,7 +13,7 @@
    "xhci_pci"
    "ahci"
    "nvme"
-    "usb_storage"
+    "usb-storage"
    "sd_mod"
    "rtsx_pci_sdmmc"
  ];
--- a/microsoft/surface/surface-pro-intel/thermal-conf.xml
+++ b/microsoft/surface/surface-pro-intel/thermal-conf.xml
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ThermalConfiguration>
-<Platform>
+  <Platform>
    <Name>Surface Pro Intel Thermal Workaround</Name>
    <ProductName>*</ProductName>
    <Preference>QUIET</Preference>
@ -10,18 +10,30 @@
        <TripPoints>
          <TripPoint>
            <SensorType>x86_pkg_temp</SensorType>
-					<Temperature>65000</Temperature>
+            <Temperature>63769</Temperature>
            <type>passive</type>
-					<ControlType>SEQUENTIAL</ControlType>
+            <ControlType>PARALLEL</ControlType>
            <CoolingDevice>
              <index>1</index>
              <type>rapl_controller</type>
-						<influence>100</influence>
-						<SamplingPeriod>10</SamplingPeriod>
+              <influence> 100 </influence>
+              <SamplingPeriod> 10 </SamplingPeriod>
+            </CoolingDevice>
+            <CoolingDevice>
+              <index>2</index>
+              <type>intel_pstate</type>
+              <influence> 90 </influence>
+              <SamplingPeriod> 10 </SamplingPeriod>
+            </CoolingDevice>
+            <CoolingDevice>
+              <index>3</index>
+              <type>intel_powerclamp</type>
+              <influence> 80 </influence>
+              <SamplingPeriod> 10 </SamplingPeriod>
            </CoolingDevice>
          </TripPoint>
        </TripPoints>
      </ThermalZone>
    </ThermalZones>
-</Platform>
+  </Platform>
 </ThermalConfiguration>
--- a/purism/librem/5r4/initrd.nix
+++ b/purism/librem/5r4/initrd.nix
@ -14,7 +14,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
      "tps6598x"
      "xhci_hcd"
      "usbcore"
-      "usb_storage"
+      "usb-storage"
      "uas"
      "xhci_plat_hcd"
    ];
@ -56,7 +56,7 @@ lib.mkIf config.hardware.librem5.customInitrdModules {
      "tps6598x"
      "xhci_hcd"
      "usbcore"
-      "usb_storage"
+      "usb-storage"
      "uas"
      "xhci_plat_hcd"
    ];
--- a/raspberry-pi/3/default.nix
+++ b/raspberry-pi/3/default.nix
@ -9,7 +9,7 @@
    kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi3;
    initrd.availableKernelModules = [
      "usbhid"
-      "usb_storage"
+      "usb-storage"
    ];
  };

--- a/raspberry-pi/4/default.nix
+++ b/raspberry-pi/4/default.nix
@ -31,9 +31,9 @@
    kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi4;
    initrd.availableKernelModules = [
      "usbhid"
-      "usb_storage"
+      "usb-storage"
      "vc4"
-      "pcie_brcmstb" # required for the pcie bus to work
+      "pcie-brcmstb" # required for the pcie bus to work
      "reset-raspberrypi" # required for vl805 firmware to load
    ]
    ++ lib.optional config.boot.initrd.network.enable "genet";
--- a/raspberry-pi/5/default.nix
+++ b/raspberry-pi/5/default.nix
@ -16,7 +16,7 @@ in
    initrd.availableKernelModules = [
      "nvme"
      "usbhid"
-      "usb_storage"
+      "usb-storage"
    ];
  };
Author	SHA1	Message	Date
Yeshey	134534628c	Merge `bc68d15667` into `52113c4f5c`	2025-11-07 08:29:58 -05:00
Jörg Thalheim	52113c4f5c	Merge pull request #1668 from concatime/fix/rename-modules Rename some modules to their correct names	2025-11-06 21:07:11 +00:00
Issam E. Maghni	fc4c7c6ec7	meta: rename module to pcie-brcmstb https://github.com/torvalds/linux/blob/v6.17/drivers/pci/controller/Makefile#L37	2025-11-06 15:05:04 -05:00
Issam E. Maghni	744975050f	meta: rename module to usb-storage https://github.com/torvalds/linux/blob/v6.17/drivers/usb/storage/Kconfig#L23-L24 > To compile this driver as a module, choose M here: the > module will be called usb-storage.	2025-11-06 15:05:04 -05:00
Yeshey	bc68d15667	Update thermal-config.xml surface-pro-intel Thermald config from: https://github.com/linux-surface/linux-surface/issues/221#issuecomment-1732658939	2025-08-29 13:20:56 +01:00