From a75a7cf6855c36318088731d9de713774acbf3e9 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Sat, 23 Dec 2023 18:43:07 -0800
Subject: [PATCH] device-lenovo-21bx: drop kernel cmdline params, add modules
 to initfs (MR 4696)

These cmdline params are not needed because the issues they worked
around were fixed in 6.7 or in this kernel branch we are using.

Additional modules are included in the initramfs since they may not be
builtin in the future, and not having them loaded in the initfs can break booting
---
 device/testing/device-lenovo-21bx/APKBUILD       | 6 +++---
 device/testing/device-lenovo-21bx/deviceinfo     | 3 +--
 device/testing/device-lenovo-21bx/modules-initfs | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/device/testing/device-lenovo-21bx/APKBUILD b/device/testing/device-lenovo-21bx/APKBUILD
index 96671983f..ceee6892f 100644
--- a/device/testing/device-lenovo-21bx/APKBUILD
+++ b/device/testing/device-lenovo-21bx/APKBUILD
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lenovo-21bx
 pkgdesc="Lenovo ThinkPad X13s"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -57,7 +57,7 @@ vulkan() {
 }
 
 sha512sums="
-8c8e03e6061e72305442b27f3f6e0d096d4d7257ee3e2a9edbf1d87e0baf43a70417784465cad480d7bb557b00f012293e1a748c436937587ba5c007834274dc  deviceinfo
-84767961200e6c04928c34365d9c1daa7da90214690666f87e844f4a42d8f2abc551a4f353196babbabe6b3b4c0e754a2175e7a79d92d842804d6a31ef09410c  modules-initfs
+1ea027b43696d4e627b7eb481ba1c559ecf740c0c3a0b8244b79e5c9ce45c31a7606f8f1257fdd669e7073cb8cdfc8158b124f8f691c74057f8bbb663934b202  deviceinfo
+5e91aebdd5aa84eef2660c5cbecd27b1c3662f1707538d53764a74dc1e6cbac451b1041b9aaab92f087d44630036b10e5155a993dd4b2e54cba81637ddb47593  modules-initfs
 82f7719285434d8c7a5268ddc21d513bb3f3788eb3dd2df099e1c245add9d19719047b003a47edb077e095ebe09d9601b1312c001578e7dfa4ed61d72098ef74  firmware.files
 "
diff --git a/device/testing/device-lenovo-21bx/deviceinfo b/device/testing/device-lenovo-21bx/deviceinfo
index b990544d3..e9742ee23 100644
--- a/device/testing/device-lenovo-21bx/deviceinfo
+++ b/device/testing/device-lenovo-21bx/deviceinfo
@@ -15,8 +15,7 @@ deviceinfo_gpu_accelerated="true"
 deviceinfo_chassis="laptop"
 deviceinfo_keyboard="true"
 deviceinfo_external_storage="true"
-# most parameters from: https://github.com/jhovold/linux/wiki/X13s#kernel-command-line
-deviceinfo_kernel_cmdline="console=null iommu.passthrough=0 iommu.strict=0 pcie_aspm.policy=powersupersave clk_ignore_unused arm64.nopauth efi=noruntime"
+deviceinfo_kernel_cmdline="console=null"
 
 # Bootloader related
 deviceinfo_flash_method="none"
diff --git a/device/testing/device-lenovo-21bx/modules-initfs b/device/testing/device-lenovo-21bx/modules-initfs
index 4be40486e..02544336c 100644
--- a/device/testing/device-lenovo-21bx/modules-initfs
+++ b/device/testing/device-lenovo-21bx/modules-initfs
@@ -3,10 +3,8 @@ nvme
 phy_qcom_qmp_pcie
 pcie_qcom
 
-# Keyboard and mouse
-i2c_hid_of
-
 # Keyboard, mouse, some on-board devices
+i2c_hid_of
 i2c_qcom_geni
 
 # PWM, backlight
@@ -22,6 +20,8 @@ gpio_sbu_mux
 phy_qcom_qmp_combo
 
 # Display
-msm
+gpucc_sc8280xp
+dispcc_sc8280xp
 panel_edp
 phy_qcom_edp
+msm