From 327c88516bb14256a1f14eabdbb54a31805e3aa8 Mon Sep 17 00:00:00 2001
From: RJ Trujillo <rj.sampson@chainguard.dev>
Date: Wed, 8 Jan 2025 20:28:13 -0700
Subject: [PATCH] fix(hwe): Fix keyboards on Surface devices (#2123)

Signed-off-by: RJ Sampson <rj.sampson@chainguard.dev>
---
 build_files/base/09-hwe-additions.sh | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/build_files/base/09-hwe-additions.sh b/build_files/base/09-hwe-additions.sh
index 17d76df64c8..f10ddab6a86 100755
--- a/build_files/base/09-hwe-additions.sh
+++ b/build_files/base/09-hwe-additions.sh
@@ -42,24 +42,9 @@ rpm-ostree install \
     "${SURFACE_PACKAGES[@]}"
 
 tee /usr/lib/modules-load.d/ublue-surface.conf << EOF
-# Add modules necessary for Disk Encryption via keyboard
-surface_aggregator
-surface_aggregator_registry
-surface_aggregator_hub
-surface_hid_core
-8250_dw
-
-# Surface Laptop 3/Surface Book 3 and later
-surface_hid
-surface_kbd
-
 # Only on AMD models
 pinctrl_amd
 
-# Only on Intel models
-intel_lpss
-intel_lpss_pci
-
 # Surface Book 2
 pinctrl_sunrisepoint
 
@@ -74,6 +59,21 @@ pinctrl_alderlake
 
 # For Surface Pro 10/Surface Laptop 6
 pinctrl_meteorlake
+
+# Only on Intel models
+intel_lpss
+intel_lpss_pci
+
+# Add modules necessary for Disk Encryption via keyboard
+surface_aggregator
+surface_aggregator_registry
+surface_aggregator_hub
+surface_hid_core
+8250_dw
+
+# Surface Laptop 3/Surface Book 3 and later
+surface_hid
+surface_kbd
 EOF
 
 echo "::endgroup::"