From e535c50ddf888433d37df809e88c171c181b277d Mon Sep 17 00:00:00 2001
From: Clayton Craft <craftyguy@postmarketos.org>
Date: Mon, 17 Nov 2025 22:31:24 -0800
Subject: [PATCH] device-lenovo-21bx: add more modules to initramfs

The kernel this device uses builds more things as modules now, so we
need to make sure they're in the initramfs

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6648>
---
 device/community/device-lenovo-21bx/APKBUILD  |  4 +-
 .../device-lenovo-21bx/modules-initfs         | 83 ++++++++++++-------
 2 files changed, 53 insertions(+), 34 deletions(-)

diff --git a/device/community/device-lenovo-21bx/APKBUILD b/device/community/device-lenovo-21bx/APKBUILD
index 130f1e8a7..0d853b30c 100644
--- a/device/community/device-lenovo-21bx/APKBUILD
+++ b/device/community/device-lenovo-21bx/APKBUILD
@@ -5,7 +5,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=15
+pkgver=16
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -84,7 +84,7 @@ sha512sums="
 0254e1277ad0971c50e6e69b377983e8b25f8f45773fdef98fe3a9df7cb06e1c5b9553109e8bd20472099562f82a08b2c9329c72d0ef97210840b5c00a048caa  01_device-lenovo-21bx.override
 95260beda1a476801f699b10aee77ce1b0342ae67b3120c0d6a59a09f04489c67d579d2c90d1899a90e6b4220ab8726da2eb295e28ed22a800ee78b7b408932b  deviceinfo
 5f4e6a80455c8a2ed879bfd457a89f81790824657ed4101e03b7ec288a274e63340f48e2ad5028cf83744263a4529584b1e94c36d10b98912e5b31804fa98ff0  firmware.files
-27705e998db262602b50004083fe160dbcde88e9fdcaeb43e3d1d79be0b7af371f84855bb93ba16ada3cf5fa8ff8da6ca159cda4b1de08fb54ac451c57169c57  modules-initfs
+45d56b8d6157dd7d679d0d4af4866973e6e0365c276fa56c008cbc8373f64626c881b6097ad1b9fa9c0d5b769e61b5a81466d6a773e2848c9ee89f06c0302249  modules-initfs
 52bbb9564ec713db5d46937701b121afe0c6c644fffe189a05766f491b4997b1bbc4c1f90229efb5764d795df8d40a57d4c840ee4b32d426e7a84520364b8bf5  pipewire.conf
 0d0412eb1f01af39000c39391f622640461305d83dae1a53aa7eef640cc17fd265cabca4e4e57dea053c47a4e50f9feb90f12ee5310d5b6425783e83efc5f9d8  usbguard.conf
 "
diff --git a/device/community/device-lenovo-21bx/modules-initfs b/device/community/device-lenovo-21bx/modules-initfs
index b77139e74..cab747930 100644
--- a/device/community/device-lenovo-21bx/modules-initfs
+++ b/device/community/device-lenovo-21bx/modules-initfs
@@ -1,39 +1,58 @@
-# PCIe + NVMe
-nvme
-phy_qcom_qmp_pcie
-pcie_qcom
-
-# Keyboard, mouse, some on-board devices
-i2c_hid_of
-i2c_qcom_geni
-
-# PWM, backlight
-leds_qcom_lpg
-pwm_bl
-
-# Battery management, TCPM, remote DSPs
-qrtr
-pmic_glink_altmode
-
-# USB-C
-gpio_sbu_mux
-phy_qcom_qmp_combo
-
-# Display
-gpucc_sc8280xp
+apr
 dispcc_sc8280xp
-panel_edp
-phy_qcom_edp
-msm
-
-# USB boot
-phy_qcom_qmp_usb
-phy_qcom_snps_femto_v2
 dwc3
 dwc3_qcom
 extcon_core
-## Need to load remoteproc modules in the initramfs, if they are loaded later
-## then it can cause a power cycle that breaks USB
+gpio_sbu_mux
+gpucc_sc8280xp
+hci_uart
+hid_generic
+hid_multitouch
+i2c_hid_of
+i2c_hid_of_elan
+i2c_qcom_cci
+i2c_qcom_geni
+icc_bwmon
+icc_osm_l3
+leds_gpio
+leds_qcom_lpg
+llcc_qcom
+lpasscc_sc8280xp
+msm
+nvme
+panel_edp
+pci_pwrctrl_pwrseq
+pcie_qcom
+phy_qcom_edp
+phy_qcom_qmp_combo
+phy_qcom_qmp_pcie
+phy_qcom_qmp_usb
+phy_qcom_snps_femto_v2
+pinctrl_sc8280xp_lpass_lpi
+pmic_glink
+pmic_glink_altmode
+pwm_bl
+pwrseq-core
+pwrseq_qcom_wcn
+q6apm_dai
+q6apm_lpass_dais
+q6prm
+q6prm_clocks
+qcom-pm8008-regulator
+qcom_battmgr
+qcom_camss
 qcom_common
+qcom_pm8008
+qcom_pon
 qcom_q6v5_pas
+qcom_rng
+qcom_spmi_adc5
+qcom_spmi_adc_tm5
+qcom_spmi_temp_alarm
+qcom_stats
+qcom_wdt
+qrtr
 qrtr-smd
+rtc_pm8xxx
+typec
+videocc_sm8350