Fix kernel builds for trogdor-wormdingler

Author: jmbaur

flake.lock

@@ -3,6 +3,7 @@
   linux.kconfig = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (
     with lib.kernel;
     {
+      ARM64_AMU_EXTN = yes;
       ARM64_ERRATUM_1024718 = yes;
       ARM64_ERRATUM_1165522 = yes;
       ARM64_ERRATUM_1286807 = yes;
@@ -42,6 +43,7 @@
       IIO = unset;
       MAILBOX = yes;
       MFD_SYSCON = yes;
+      MMC_SDHCI_PLTFM = yes;
       MTD = yes;
       MTD_BLOCK = yes;
       NVMEM = yes;
@@ -66,7 +68,6 @@
       SPMI = yes;
       SRAM = unset;
       SUSPEND = yes;
-      ARM64_AMU_EXTN = yes;
     }
   );
 }

kernel-configs/aarch64.nix

@@ -17,8 +17,6 @@
       HID_VIVALDI = yes;
       I2C_CROS_EC_TUNNEL = yes;
       KEYBOARD_CROS_EC = yes;
-      MMC = yes;
-      MMC_BLOCK = yes;
       TCG_TIS_I2C_CR50 = yes;
       TCG_TIS_SPI = yes;
       TCG_TIS_SPI_CR50 = yes;

kernel-configs/chromebook.nix

@@ -69,6 +69,9 @@ in
     KEYS = yes;
     LSM = freeform "integrity";
     LTO_NONE = yes;
+    MMC = yes;
+    MMC_BLOCK = yes;
+    MMC_SDHCI = yes;
     MMU = yes;
     MODULE_SIG_FORMAT = yes;
     MSDOS_FS = yes;

kernel-configs/generic.nix

@@ -32,24 +32,28 @@
         PINCTRL_ALDERLAKE = yes;
       };
       "qualcomm" = {
+        # PHY_ATH79_USB = yes;
+        # QCOM_SPMI_ADC5 = unset;
+        # QCOM_SPMI_ADC_TM5 = unset;
+        # QCOM_SPMI_TEMP_ALARM = unset;
         ARCH_QCOM = yes;
         ARM_QCOM_CPUFREQ_HW = unset;
         ARM_SMMU_QCOM = yes;
         BACKLIGHT_QCOM_WLED = unset;
         COMMON_CLK_QCOM = yes;
         CRYPTO_DEV_QCOM_RNG = yes;
-        HWSPINLOCK = unset;
-        HWSPINLOCK_QCOM = unset;
+        HWSPINLOCK = yes;
+        HWSPINLOCK_QCOM = yes;
+        HW_RANDOM = yes;
         I2C_QCOM_CCI = yes;
         I2C_QCOM_GENI = yes;
         I2C_QUP = yes;
-        INTERCONNECT = unset;
-        INTERCONNECT_QCOM = unset;
+        INTERCONNECT = yes;
+        INTERCONNECT_QCOM = yes;
         INTERCONNECT_QCOM_SC7180 = yes;
-        LEDS_QCOM_FLASH = unset;
+        MFD_SPMI_PMIC = yes;
         MMC_SDHCI_MSM = yes;
         NVMEM_QCOM_QFPROM = yes;
-        PHY_ATH79_USB = yes;
         PHY_QCOM_APQ8064_SATA = unset;
         PHY_QCOM_EDP = unset;
         PHY_QCOM_EUSB2_REPEATER = yes;
@@ -66,16 +70,16 @@
         PHY_QCOM_QUSB2 = unset;
         PHY_QCOM_SGMII_ETH = unset;
         PHY_QCOM_SNPS_EUSB2 = unset;
-        PHY_QCOM_USB_HS = unset;
-        PHY_QCOM_USB_HSIC = unset;
-        PHY_QCOM_USB_HS_28NM = unset;
+        PHY_QCOM_USB_HS = yes;
+        PHY_QCOM_USB_HSIC = yes;
+        PHY_QCOM_USB_HS_28NM = yes;
         PHY_QCOM_USB_SNPS_FEMTO_V2 = unset;
+        USB_ULPI_BUS = yes;
         PHY_QCOM_USB_SS = unset;
         PINCTRL_MSM = yes;
         PINCTRL_QCOM_SPMI_PMIC = unset;
         PINCTRL_SC7180 = yes;
         POWER_RESET_QCOM_PON = yes;
-        PWM_CROS_EC = unset;
         QCOM_AOSS_QMP = yes;
         QCOM_APCS_IPC = yes;
         QCOM_APR = yes;
@@ -93,29 +97,21 @@
         QCOM_ICC_BWMON = yes;
         QCOM_IOMMU = yes;
         QCOM_IPCC = yes;
-        QCOM_L2_PMU = yes;
-        QCOM_L3_PMU = yes;
         QCOM_LLCC = yes;
         QCOM_MPM = unset;
         QCOM_OCMEM = unset;
         QCOM_PDC = unset;
-        QCOM_PIL_INFO = yes;
         QCOM_PMIC_GLINK = yes;
+        QCOM_Q6V5_PAS = yes;
         QCOM_RMTFS_MEM = yes;
-        QCOM_RPMH = unset;
-        QCOM_RPMHPD = unset;
-        QCOM_RPMPD = unset;
-        QCOM_RPROC_COMMON = yes;
+        QCOM_RPMH = yes;
+        QCOM_RPMHPD = yes;
+        QCOM_RPMPD = yes;
         QCOM_SMD_RPM = yes;
         QCOM_SMEM = yes;
         QCOM_SMP2P = yes;
         QCOM_SMSM = yes;
         QCOM_SPM = yes;
-        QCOM_SPMI_ADC5 = unset;
-        QCOM_SPMI_ADC_TM5 = unset;
-        QCOM_SPMI_TEMP_ALARM = unset;
-        QCOM_STATS = yes;
-        QCOM_TSENS = yes;
         QCOM_WCNSS_CTRL = yes;
         QCOM_WDT = yes;
         REGULATOR_QCOM_RPMH = yes;
@@ -140,7 +136,7 @@
         SPI_QCOM_QSPI = yes;
         SPMI_MSM_PMIC_ARB = unset;
         USB_DWC3_QCOM = yes;
-        USB_ONBOARD_HUB = yes;
+        USB_ONBOARD_DEV = yes;
       };
       "mediatek" = {
         ARCH_MEDIATEK = yes;