Merge branch 'NixOS:master' into tuxedo-pulse-15-gen-2

README.md

@@ -81,6 +81,7 @@ See code for all available configurations.
 | [Apple MacBook Pro 12,1](apple/macbook-pro/12-1)                    | `<nixos-hardware/apple/macbook-pro/12-1>`          |
 | [Apple MacBook Pro 14,1](apple/macbook-pro/14-1)                    | `<nixos-hardware/apple/macbook-pro/14-1>`          |
 | [Apple Macs with a T2 Chip](apple/t2)                               | `<nixos-hardware/apple/t2>`                        |
+| [Asus ROG Ally RC71L (2023)](asus/ally/rc71l)                       | `<nixos-hardware/asus/ally/rc71l>`                 |
 | [Asus ROG Strix G733QS](asus/rog-strix/g733qs)                      | `<nixos-hardware/asus/rog-strix/g733qs>`           |
 | [Asus ROG Zephyrus G14 GA401](asus/zephyrus/ga401)                  | `<nixos-hardware/asus/zephyrus/ga401>`             |
 | [Asus ROG Zephyrus G14 GA402](asus/zephyrus/ga402)                  | `<nixos-hardware/asus/zephyrus/ga402>`             |
@@ -229,6 +230,7 @@ See code for all available configurations.
 | [Hardkernel Odroid HC4](hardkernel/odroid-hc4/default.nix)          | `<nixos-hardware/hardkernel/odroid-hc4>`           |
 | [Hardkernel Odroid H3](hardkernel/odroid-h3/default.nix)            | `<nixos-hardware/hardkernel/odroid-h3>`            |
 | [Omen 15-en0010ca](omen/15-en0010ca)                                | `<nixos-hardware/omen/15-en0010ca>`                |
+| [Omen 16-n0005ne](omen/16-n0005ne)                                  | `<nixos-hardware/omen/16-n0005ne>`                 |
 | [Omen 15-en1007sa](omen/15-en1007sa)                                | `<nixos-hardware/omen/15-en1007sa>`                |
 | [Omen en00015p](omen/en00015p)                                      | `<nixos-hardware/omen/en00015p>`                   |
 | [One-Netbook OneNetbook 4](onenetbook/4)                            | `<nixos-hardware/onenetbook/4>`                    |

asus/ally/rc71l/README.md

@@ -0,0 +1,10 @@
+# [ROG Ally (2023)](https://rog.asus.com/gaming-handhelds/rog-ally/rog-ally-2023/)
+
+## BIOS
+
+The ROG Ally has a troublesome history with different BIOS versions creating different issues.
+At the time of writing, the current BIOS version 330 allows for working audio without further kernel patches.
+
+## Further resources
+
+- The steam module from https://github.com/Jovian-Experiments/Jovian-NixOS can be used to boot into the Steam Deck UI

asus/ally/rc71l/default.nix

@@ -0,0 +1,15 @@
+{ pkgs, lib, ... }:
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+    ../../../common/gpu/amd
+    ../../../common/pc/laptop
+    ../../../common/pc/laptop/ssd
+    ../../battery.nix
+  ];
+
+  # 6.5 adds many fixes and improvements for the Ally
+  # This includes for example performance, audio and bluetooth
+  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "6.5") (lib.mkDefault pkgs.linuxPackages_latest);
+}

common/gpu/amd/default.nix

@@ -1,16 +1,16 @@
 { config, lib, pkgs, ... }:
 
 {
-  options.hardware.amdgpu.loadInInitrd = lib.mkEnableOption (lib.mdDoc 
+  options.hardware.amdgpu.loadInInitrd = lib.mkEnableOption (lib.mdDoc
     "loading `amdgpu` kernelModule at stage 1. (Add `amdgpu` to `boot.initrd.kernelModules`)"
   ) // {
     default = true;
   };
-  options.hardware.amdgpu.amdvlk = lib.mkEnableOption (lib.mdDoc 
+  options.hardware.amdgpu.amdvlk = lib.mkEnableOption (lib.mdDoc
     "use amdvlk drivers instead mesa radv drivers"
   );
-  options.hardware.amdgpu.opencl = lib.mkEnableOption (lib.mdDoc 
-    "rocm opencl runtime (Install rocm-opencl-icd and rocm-opencl-runtime)"
+  options.hardware.amdgpu.opencl = lib.mkEnableOption (lib.mdDoc
+    "rocm opencl runtime (Install rocmPackages.clr and rocmPackages.clr.icd)"
   ) // {
     default = true;
   };
@@ -37,10 +37,10 @@
       ];
     })
     (lib.mkIf config.hardware.amdgpu.opencl {
-      hardware.opengl.extraPackages = with pkgs; [
-        rocm-opencl-icd
-        rocm-opencl-runtime
-      ];
+      hardware.opengl.extraPackages =
+        if pkgs ? rocmPackages.clr
+        then with pkgs.rocmPackages; [ clr clr.icd ]
+        else with pkgs; [ rocm-opencl-icd rocm-opencl-runtime ];
     })
   ];
-} 
+}

flake.nix

@@ -15,6 +15,7 @@
       apple-macbook-pro-14-1 = import ./apple/macbook-pro/14-1;
       apple-t2 = import ./apple/t2;
       asus-battery = import ./asus/battery.nix;
+      asus-ally-rc71l = import ./asus/ally/rc71l;
       asus-fx504gd = import ./asus/fx504gd;
       asus-rog-strix-g733qs = import ./asus/rog-strix/g733qs;
       asus-zephyrus-ga401 = import ./asus/zephyrus/ga401;
@@ -169,6 +170,7 @@
       hardkernel-odroid-hc4 = import ./hardkernel/odroid-hc4;
       hardkernel-odroid-h3 = import ./hardkernel/odroid-h3;
       omen-15-en0010ca = import ./omen/15-en0010ca;
+      omen-16-n0005ne = import ./omen/16-n0005ne;
       omen-15-en1007sa = import ./omen/15-en1007sa;
       omen-en00015p = import ./omen/en00015p;
       onenetbook-4 = import ./onenetbook/4;

microchip/common/bsp/linux-icicle-kit.nix

@@ -3,7 +3,7 @@
 with pkgs;
 
 buildLinux (args // rec {
-  version = "5.15.92-linux4microchip+fpga-2023.02";
+  version = "6.1.43-linux4microchip+fpga-2023.09";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = version;
@@ -63,7 +63,7 @@ buildLinux (args // rec {
   src = fetchFromGitHub {
     owner = "linux4microchip";
     repo = "linux";
-    rev = "360a547daec2a69169be49d3da9cca8b1ecb325f";
-    sha256 = "sha256-ri2d91bHmcFkV2PjwRNho1XQixKttJKoG/qiOdeB01M=";
+    rev = "25e35c7c54ad853d03c14a02b189b408cb5b5eb3";
+    sha256 = "sha256-wj7lz247MkhxmhSHUcNeWmcZK+DL+5PAnLwTmALD97M=";
   };
 } // (args.argsOverride or { }))

microchip/common/bsp/patches/0001-Boot-environment-for-Microchip-Iciclle-Kit.patch

@@ -1,26 +1,27 @@
-From 2085960b5dfc7058d572cfb90fa349efe9bacdf2 Mon Sep 17 00:00:00 2001
-From: Ganga Ram <[email protected]>
-Date: Mon, 24 Apr 2023 10:15:22 +0400
+From 313309c07e904ba48386568c361f4a3265829a81 Mon Sep 17 00:00:00 2001
+From: Ganga Ram <[email protected]>
+Date: Tue, 10 Oct 2023 17:07:49 +0400
 Subject: [PATCH] Boot environment for Microchip Iciclle Kit
 
-Signed-off-by: Ganga Ram <[email protected]>
+Signed-off-by: Ganga Ram <[email protected]>
 ---
  include/configs/microchip_mpfs_icicle.h | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h
-index 9ef5425c9f..c8a1f7c9df 100644
+index 0b9eb59bc4..59b4465f1e 100644
 --- a/include/configs/microchip_mpfs_icicle.h
 +++ b/include/configs/microchip_mpfs_icicle.h
-@@ -71,6 +71,9 @@
- #define CONFIG_EXTRA_ENV_SETTINGS \
-	"bootm_size=0x10000000\0" \
-	"scriptaddr=0x8e000000\0" \
+@@ -125,6 +125,9 @@
+ #define CFG_EXTRA_ENV_SETTINGS \
+ 	"bootm_size=0x10000000\0" \
+ 	"scriptaddr=0x8e000000\0" \
 +  "kernel_addr_r=0x8e000000\0" \
 +  "ramdisk_addr_r=0x90000000\0" \
 +  "fdt_addr_r=0x92000000\0" \
-	BOOTENV_DESIGN_OVERLAYS \
-	BOOTENV \
-
---
+ 	BOOTENV_DESIGN_OVERLAYS \
+ 	BOOTENV \
+ 
+-- 
 2.39.2
+

microchip/common/bsp/uboot.nix

@@ -8,14 +8,14 @@ with pkgs; let
 in
 buildUBoot rec {
   pname = "uboot";
-  version = "linux4microchip+fpga-2023.06";
+  version = "linux4microchip+fpga-2023.09";
 
   src = fetchFromGitHub {
     owner = "polarfire-soc";
     repo = "u-boot";
     # from mpfs-uboot-2022.01 branch
-    rev = "7e19f9dff788025403ac6a34d9acf8736eef32ff";
-    sha256 = "sha256-1qmifjjNxPOUWRgZdQk6Ld5KGQk/PypSRK/ILPSsTLs";
+    rev = "8f5e331e3f09cdf469d528905f5d6a7139016634";
+    sha256 = "sha256-UElnkRgzcvTjAo5X9N8c1fCTrTxdpAGkntcpQlqgDy8=";
   };
 
   extraMakeFlags = [
@@ -24,7 +24,6 @@ buildUBoot rec {
 
   patches = [
     ./patches/0001-Boot-environment-for-Microchip-Iciclle-Kit.patch
-    ./patches/0002-Riscv-Fix-build-against-binutils-2.38.patch
   ];
   defconfig = "${targetBoard}_defconfig";
   enableParallelBuilding = true;

omen/15-en0010ca/default.nix

@@ -3,15 +3,16 @@
 {
   imports = [
     ../../common/cpu/amd
+    ../../common/cpu/amd/pstate.nix
     ../../common/gpu/amd
     ../../common/gpu/nvidia/prime.nix
     ../../common/pc/laptop
     ../../common/pc/ssd
   ];
 
   # Enables ACPI platform profiles
-  boot = lib.mkIf (lib.versionAtLeast pkgs.linux.version "6.1") { 
-    kernelModules = [ "hp-wmi" ];  
+  boot = lib.mkIf (lib.versionAtLeast pkgs.linux.version "6.1") {
+    kernelModules = [ "hp-wmi" ];
   };
 
   hardware.nvidia.prime = {

omen/15-en1007sa/default.nix

@@ -3,6 +3,7 @@
 {
   imports = [
     ../../common/cpu/amd
+    ../../common/cpu/amd/pstate.nix
     ../../common/gpu/nvidia/prime.nix
     ../../common/pc/laptop
     ../../common/pc/ssd

omen/16-n0005ne/README.md

@@ -0,0 +1,4 @@
+# HP Omen 16-n0005ne
+
+## ACPI platform profiles
+This config enables `hp-wmi`, which allows switch between cool, balanced, and performance modes on the platform EC, used by power management tools like `power-profile-daemon` and `tlp`.

omen/16-n0005ne/default.nix

@@ -0,0 +1,16 @@
+{ lib, pkgs, ... }:
+
+{
+  imports = [
+    ../../common/cpu/amd
+    ../../common/cpu/amd/pstate.nix
+    ../../common/gpu/amd
+    ../../common/pc/laptop
+    ../../common/pc/ssd
+  ];
+
+  # Enables ACPI platform profiles
+  boot = lib.mkIf (lib.versionAtLeast pkgs.linux.version "6.1") {
+    kernelModules = [ "hp-wmi" ];
+  };
+}

omen/en00015p/default.nix

@@ -3,6 +3,7 @@
 {
   imports = [
     ../../common/cpu/amd
+    ../../common/cpu/amd/pstate.nix
     ../../common/gpu/nvidia/prime.nix
     ../../common/pc/laptop
     ../../common/pc/ssd

pine64/pinebook-pro/default.nix

@@ -36,38 +36,18 @@
     "tcpm"
     "typec"
 
+    # PCIe/NVMe
+    "nvme"
+    "pcie_rockchip_host"
+    "phy_rockchip_pcie"
+
     # Misc. modules
     "cw2015_battery"
     "gpio_charger"
     "rtc_rk808"
   ];
 
-  services.udev.extraHwdb = lib.mkMerge [
-    # https://github.com/elementary/os/blob/05a5a931806d4ed8bc90396e9e91b5ac6155d4d4/build-pinebookpro.sh#L253-L257
-    # Disable the "keyboard mouse" in libinput. This is reported by the keyboard firmware
-    # and is probably a placeholder for a TrackPoint style mouse that doesn't exist
-    ''
-      evdev:input:b0003v258Ap001Ee0110-e0,1,2,4,k110,111,112,r0,1,am4,lsfw
-        ID_INPUT=0
-        ID_INPUT_MOUSE=0
-    ''
-  ];
-
-  # https://github.com/elementary/os/blob/05a5a931806d4ed8bc90396e9e91b5ac6155d4d4/build-pinebookpro.sh#L253-L257
-  # Mark the keyboard as internal, so that "disable when typing" works for the touchpad
-  environment.etc."libinput/local-overrides.quirks".text = ''
-    [Pinebook Pro Keyboard]
-    MatchUdevType=keyboard
-    MatchBus=usb
-    MatchVendor=0x258A
-    MatchProduct=0x001E
-    AttrKeyboardIntegration=internal
-  '';
-
   hardware.enableRedistributableFirmware = true;
-  hardware.firmware = [
-    (pkgs.callPackage ./firmware/ap6256-firmware { })
-  ];
 
   # The default powersave makes the wireless connection unusable.
   networking.networkmanager.wifi.powersave = lib.mkDefault false;

purism/librem/5r4/kernel/default.nix

@@ -1,4 +1,3 @@
 final: prev: {
-  linuxPackages_librem5_6_4_14 = final.linuxPackagesFor (final.callPackage ./6.4.14.nix { });
-  linuxPackages_librem5 = final.linuxPackages_librem5_6_4_14;
+  linuxPackages_librem5 = final.linuxPackagesFor (final.callPackage ./kernel.nix { });
 }

purism/librem/5r4/kernel/6.4.14.nix → purism/librem/5r4/kernel/kernel.nix

@@ -6,14 +6,14 @@
 buildLinux (args
   // rec {
   defconfig = "librem5_defconfig";
-  version = "6.4.14-librem5";
+  version = "6.5.6-librem5";
   modDirVersion = version;
   src = fetchFromGitLab {
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = "linux";
-    rev = "pureos/6.4.14pureos1";
-    hash = "sha256-PzRG6czWLMahklceuaWGK1QJ+m9FAKDa/m1jp87h62k=";
+    rev = "pureos/6.5.6pureos1";
+    hash = "sha256-hOv0oy31mbC+43sI1n1oqKl7TtT/Ivj6UhiW4maumCg=";
   };
   kernelPatches = [ ];
   structuredExtraConfig = with lib.kernel; {