Revert "sync config options with asahi default config"

This reverts commit 4ca99176f87ab63b54bc3a9526325122ed3bd5a0.

Setting a lot modules from =y to =m seems to break the sound. So lets revert
this for now.

diff --git a/config-4k.txt b/config-4k.txt
index 8814e1929343f99a28a11d35b05e02467f66260c..e96b04699c1367cfb8fdc3537fc31f88415f6aaa 100644 (file)
--- a/config-4k.txt
+++ b/config-4k.txt
@@ -593,7 +593,7 @@ CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 # CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set
 CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 # CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set

-CONFIG_ARM_APPLE_SOC_CPUFREQ=m
+CONFIG_ARM_APPLE_SOC_CPUFREQ=y

 CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
 # CONFIG_ARM_ARMADA_8K_CPUFREQ is not set
 CONFIG_ARM_IMX_CPUFREQ_DT=m
 CONFIG_ARM_ARMADA_37XX_CPUFREQ=m
 # CONFIG_ARM_ARMADA_8K_CPUFREQ is not set
 CONFIG_ARM_IMX_CPUFREQ_DT=m


@@ -2150,7 +2150,7 @@ CONFIG_PCIE_BRCMSTB=y
 # CONFIG_PCIE_MICROCHIP_HOST is not set
 # CONFIG_PCIE_HISI_ERR is not set
 CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000
 # CONFIG_PCIE_MICROCHIP_HOST is not set
 # CONFIG_PCIE_HISI_ERR is not set
 CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000

-CONFIG_PCIE_APPLE=m
+CONFIG_PCIE_APPLE=y

 
 #
 # DesignWare PCI Core Support
 
 #
 # DesignWare PCI Core Support


@@ -2546,7 +2546,7 @@ CONFIG_NVME_FABRICS=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_TCP=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_FC=m
 CONFIG_NVME_TCP=m

-CONFIG_NVME_APPLE=m
+CONFIG_NVME_APPLE=y

 CONFIG_NVME_TARGET=m
 # CONFIG_NVME_TARGET_PASSTHRU is not set
 # CONFIG_NVME_TARGET_LOOP is not set
 CONFIG_NVME_TARGET=m
 # CONFIG_NVME_TARGET_PASSTHRU is not set
 # CONFIG_NVME_TARGET_LOOP is not set


@@ -4387,7 +4387,7 @@ CONFIG_I2C_MESON=m
 CONFIG_I2C_MV64XXX=m
 # CONFIG_I2C_NOMADIK is not set
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_MV64XXX=m
 # CONFIG_I2C_NOMADIK is not set
 CONFIG_I2C_OCORES=m

-CONFIG_I2C_APPLE=m
+CONFIG_I2C_APPLE=y

 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_PXA=m
 # CONFIG_I2C_PXA_SLAVE is not set
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_PXA=m
 # CONFIG_I2C_PXA_SLAVE is not set


@@ -4440,7 +4440,7 @@ CONFIG_SPI_MEM=y
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_ALTERA is not set
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_ALTERA is not set

-CONFIG_SPI_APPLE=m
+CONFIG_SPI_APPLE=y

 CONFIG_SPI_ARMADA_3700=m
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_ARMADA_3700=m
 # CONFIG_SPI_AXI_SPI_ENGINE is not set
 CONFIG_SPI_BCM2835=m


@@ -4504,7 +4504,7 @@ CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=y
 # CONFIG_SPMI_HISI3670 is not set
 CONFIG_SPMI_MSM_PMIC_ARB=y
 CONFIG_SPMI=y
 # CONFIG_SPMI_HISI3670 is not set
 CONFIG_SPMI_MSM_PMIC_ARB=y

-CONFIG_SPMI_APPLE=m
+CONFIG_SPMI_APPLE=y

 # CONFIG_HSI is not set
 CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set
 # CONFIG_HSI is not set
 CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set


@@ -4543,7 +4543,7 @@ CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AMD=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AMD=y

-CONFIG_PINCTRL_APPLE_GPIO=m
+CONFIG_PINCTRL_APPLE_GPIO=y

 CONFIG_PINCTRL_AXP209=m
 CONFIG_PINCTRL_MAX77620=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_AXP209=m
 CONFIG_PINCTRL_MAX77620=y
 # CONFIG_PINCTRL_MCP23S08 is not set


@@ -4769,7 +4769,7 @@ CONFIG_POWER_RESET=y
 # CONFIG_POWER_RESET_GPIO_RESTART is not set
 CONFIG_POWER_RESET_HISI=y
 # CONFIG_POWER_RESET_LINKSTATION is not set
 # CONFIG_POWER_RESET_GPIO_RESTART is not set
 CONFIG_POWER_RESET_HISI=y
 # CONFIG_POWER_RESET_LINKSTATION is not set

-CONFIG_POWER_RESET_MACSMC=m
+CONFIG_POWER_RESET_MACSMC=y

 CONFIG_POWER_RESET_MSM=y
 # CONFIG_POWER_RESET_QCOM_PON is not set
 # CONFIG_POWER_RESET_LTC2952 is not set
 CONFIG_POWER_RESET_MSM=y
 # CONFIG_POWER_RESET_QCOM_PON is not set
 # CONFIG_POWER_RESET_LTC2952 is not set


@@ -4836,7 +4836,7 @@ CONFIG_CHARGER_CROS_PCHG=m
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 # CONFIG_BATTERY_UG3105 is not set

-CONFIG_CHARGER_MACSMC=m
+CONFIG_CHARGER_MACSMC=y

 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set


@@ -5159,7 +5159,7 @@ CONFIG_BCMA_DRIVER_PCI=y
 #
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_ACT8945A is not set
 #
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_ACT8945A is not set

-CONFIG_MFD_APPLE_SPMI_PMU=m
+CONFIG_MFD_APPLE_SPMI_PMU=y

 # CONFIG_MFD_SUN4I_GPADC is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_AS3722 is not set
 # CONFIG_MFD_SUN4I_GPADC is not set
 # CONFIG_MFD_AS3711 is not set
 # CONFIG_MFD_AS3722 is not set


@@ -6708,7 +6708,7 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 CONFIG_BACKLIGHT_LP855X=m

-CONFIG_BACKLIGHT_GPIO=y
+CONFIG_BACKLIGHT_GPIO=m

 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
 # CONFIG_BACKLIGHT_ARCXCNN is not set


@@ -7425,15 +7425,15 @@ CONFIG_I2C_HID_CORE=m
 #
 # SPI HID support
 #
 #
 # SPI HID support
 #

-CONFIG_SPI_HID_APPLE_OF=m
+CONFIG_SPI_HID_APPLE_OF=y

 # end of SPI HID support
 
 # end of SPI HID support
 

-CONFIG_SPI_HID_APPLE_CORE=m
+CONFIG_SPI_HID_APPLE_CORE=y

 
 #
 # DockChannel HID support
 #
 
 #
 # DockChannel HID support
 #

-CONFIG_HID_DOCKCHANNEL=m
+CONFIG_HID_DOCKCHANNEL=y

 # end of DockChannel HID support
 # end of HID support
 
 # end of DockChannel HID support
 # end of HID support
 


@@ -8210,7 +8210,7 @@ CONFIG_RTC_DRV_XGENE=y
 #
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_GOLDFISH is not set
 #
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 # CONFIG_RTC_DRV_GOLDFISH is not set

-CONFIG_RTC_DRV_MACSMC=m
+CONFIG_RTC_DRV_MACSMC=y

 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 


@@ -8224,7 +8224,7 @@ CONFIG_DMA_ACPI=y
 CONFIG_DMA_OF=y
 # CONFIG_ALTERA_MSGDMA is not set
 # CONFIG_AMBA_PL08X is not set
 CONFIG_DMA_OF=y
 # CONFIG_ALTERA_MSGDMA is not set
 # CONFIG_AMBA_PL08X is not set

-CONFIG_APPLE_ADMAC=m
+CONFIG_APPLE_ADMAC=y

 # CONFIG_AXI_DMAC is not set
 # CONFIG_BCM_SBA_RAID is not set
 CONFIG_DMA_BCM2835=y
 # CONFIG_AXI_DMAC is not set
 # CONFIG_BCM_SBA_RAID is not set
 CONFIG_DMA_BCM2835=y


@@ -8517,7 +8517,7 @@ CONFIG_CLK_VEXPRESS_OSC=y
 # end of Clock driver for ARM Reference designs
 
 # CONFIG_LMK04832 is not set
 # end of Clock driver for ARM Reference designs
 
 # CONFIG_LMK04832 is not set

-CONFIG_COMMON_CLK_APPLE_NCO=m
+CONFIG_COMMON_CLK_APPLE_NCO=y

 # CONFIG_COMMON_CLK_MAX77686 is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_RK808=y
 # CONFIG_COMMON_CLK_MAX77686 is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_RK808=y


@@ -8768,7 +8768,7 @@ CONFIG_IOMMU_DMA=y
 CONFIG_ROCKCHIP_IOMMU=y
 # CONFIG_SUN50I_IOMMU is not set
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_ROCKCHIP_IOMMU=y
 # CONFIG_SUN50I_IOMMU is not set
 CONFIG_TEGRA_IOMMU_SMMU=y

-CONFIG_APPLE_DART=m
+CONFIG_APPLE_DART=y

 CONFIG_ARM_SMMU=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y


@@ -8827,8 +8827,8 @@ CONFIG_MESON_SECURE_PM_DOMAINS=y
 CONFIG_APPLE_PMGR_PWRSTATE=y
 CONFIG_APPLE_RTKIT=y
 CONFIG_APPLE_RTKIT_HELPER=y
 CONFIG_APPLE_PMGR_PWRSTATE=y
 CONFIG_APPLE_RTKIT=y
 CONFIG_APPLE_RTKIT_HELPER=y

-CONFIG_APPLE_SART=m
-CONFIG_APPLE_DOCKCHANNEL=m
+CONFIG_APPLE_SART=y
+CONFIG_APPLE_DOCKCHANNEL=y

 # end of Apple SoC drivers
 
 #
 # end of Apple SoC drivers
 
 #


@@ -9759,7 +9759,7 @@ CONFIG_QCOM_QFPROM=m
 # CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_ROCKCHIP_EFUSE=m
 # CONFIG_ROCKCHIP_OTP is not set
 # CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_ROCKCHIP_EFUSE=m
 # CONFIG_ROCKCHIP_OTP is not set

-CONFIG_NVMEM_SPMI_MFD=m
+CONFIG_NVMEM_SPMI_MFD=y

 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_MX_EFUSE is not set
 CONFIG_NVMEM_SUNXI_SID=m
 CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_MX_EFUSE is not set

diff --git a/patch_kernel_config.pl b/patch_kernel_config.pl
index 4c7e83d85302185615f30dfbc0c3b85545f3cd42..4c7fbbb9020546dadf7a0f016561b8b8dac9f695 100644 (file)
--- a/patch_kernel_config.pl
+++ b/patch_kernel_config.pl
@@ -10,54 +10,56 @@ my @lines = `cat config`;
 chomp @lines;
 
 my %asahi_options = (
 chomp @lines;
 
 my %asahi_options = (

-        'CONFIG_APPLE_ADMAC' => 'm',
+        'CONFIG_APPLE_ADMAC' => 'y',

         'CONFIG_APPLE_AIC' => 'y',
         'CONFIG_APPLE_AIC' => 'y',

-        'CONFIG_APPLE_DART' => 'm',
+        'CONFIG_APPLE_DART' => 'y',

         'CONFIG_APPLE_MAILBOX' => 'y',
         'CONFIG_APPLE_PLATFORMS' => 'y',
         'CONFIG_APPLE_PMGR_PWRSTATE' => 'y',
         'CONFIG_APPLE_RTKIT' => 'y',
         'CONFIG_APPLE_MAILBOX' => 'y',
         'CONFIG_APPLE_PLATFORMS' => 'y',
         'CONFIG_APPLE_PMGR_PWRSTATE' => 'y',
         'CONFIG_APPLE_RTKIT' => 'y',

-        'CONFIG_APPLE_SART' => 'm',
+        'CONFIG_APPLE_SART' => 'y',

         'CONFIG_APPLE_SMC' => 'y',
         'CONFIG_APPLE_SMC_RTKIT' => 'y',
         'CONFIG_APPLE_WATCHDOG' => 'y',
         'CONFIG_ARCH_APPLE' => 'y',
         'CONFIG_APPLE_SMC' => 'y',
         'CONFIG_APPLE_SMC_RTKIT' => 'y',
         'CONFIG_APPLE_WATCHDOG' => 'y',
         'CONFIG_ARCH_APPLE' => 'y',

-        'CONFIG_ARM_APPLE_SOC_CPUFREQ' => 'm',
+        'CONFIG_ARM_APPLE_SOC_CPUFREQ' => 'y',

         'CONFIG_BRCMFMAC' => 'm',
         'CONFIG_BRCMFMAC_PCIE' => 'y',
         'CONFIG_CFG80211_WEXT' => 'y',
         'CONFIG_BRCMFMAC' => 'm',
         'CONFIG_BRCMFMAC_PCIE' => 'y',
         'CONFIG_CFG80211_WEXT' => 'y',

-        'CONFIG_CHARGER_MACSMC' => 'm',
-        'CONFIG_COMMON_CLK_APPLE_NCO' => 'm',
+        'CONFIG_CHARGER_MACSMC' => 'y',
+        'CONFIG_COMMON_CLK_APPLE_NCO' => 'y',

         'CONFIG_DRM' => 'y',
         'CONFIG_DRM_SIMPLEDRM' => 'y',
         'CONFIG_FW_LOADER_USER_HELPER' => 'n',
         'CONFIG_FW_LOADER_USER_HELPER_FALLBACK' => 'n',
         'CONFIG_GPIO_MACSMC' => 'y',
         'CONFIG_DRM' => 'y',
         'CONFIG_DRM_SIMPLEDRM' => 'y',
         'CONFIG_FW_LOADER_USER_HELPER' => 'n',
         'CONFIG_FW_LOADER_USER_HELPER_FALLBACK' => 'n',
         'CONFIG_GPIO_MACSMC' => 'y',

-        'CONFIG_HID_APPLE' => 'm',
-        'CONFIG_HID_MAGICMOUSE' => 'm',
-        'CONFIG_I2C_APPLE' => 'm',
-        'CONFIG_MFD_APPLE_SPMI_PMU' => 'm',
-        'CONFIG_MMC_SDHCI_PCI' => 'm',
+        'CONFIG_HID_APPLE' => 'y',
+        'CONFIG_HID_MAGICMOUSE' => 'y',
+        'CONFIG_I2C_APPLE' => 'y',
+        'CONFIG_MFD_APPLE_SPMI_PMU' => 'y',
+        'CONFIG_MMC_SDHCI_PCI' => 'y',

         'CONFIG_NLMON' => 'm',
         'CONFIG_NLMON' => 'm',

-        'CONFIG_NVMEM_SPMI_MFD' => 'm',
-        'CONFIG_NVME_APPLE' => 'm',
-        'CONFIG_PCIE_APPLE' => 'm',
-        'CONFIG_PINCTRL_APPLE_GPIO' => 'm',
-        'CONFIG_POWER_RESET_MACSMC' => 'm',
-        'CONFIG_RTC_DRV_MACSMC' => 'm',
-        'CONFIG_SND_SIMPLE_CARD' => 'm',
-        'CONFIG_SND_SOC_APPLE_MCA' => 'm',
-        'CONFIG_SND_SOC_APPLE_SILICON' => 'm',
-        'CONFIG_SND_SOC_CS42L42' => 'm',
+        'CONFIG_NVMEM_SPMI_MFD' => 'y',
+        'CONFIG_NVME_APPLE' => 'y',
+        'CONFIG_PCIE_APPLE' => 'y',
+        'CONFIG_PINCTRL_APPLE_GPIO' => 'y',
+        'CONFIG_POWER_RESET_MACSMC' => 'y',
+        'CONFIG_RTC_DRV_MACSMC' => 'y',
+        'CONFIG_SND_SIMPLE_CARD' => 'y',
+        'CONFIG_SND_SOC_APPLE_MCA' => 'y',
+        'CONFIG_SND_SOC_APPLE_SILICON' => 'y',
+        'CONFIG_SND_SOC_CS42L42' => 'y',

         'CONFIG_SND_SOC_TAS2770' => 'm',
         'CONFIG_SND_SOC_TAS2770' => 'm',

-        'CONFIG_SPI_APPLE' => 'm',
-        'CONFIG_SPI_HID_APPLE_CORE' => 'm',
-        'CONFIG_SPI_HID_APPLE_OF' => 'm',
-        'CONFIG_SPMI_APPLE' => 'm',
-        'CONFIG_USB_DWC3' => 'm',
+        'CONFIG_SPI_APPLE' => 'y',
+        'CONFIG_SPI_HID_APPLE_CORE' => 'y',
+        'CONFIG_SPI_HID_APPLE_OF' => 'y',
+        'CONFIG_SPMI_APPLE' => 'y',
+        'CONFIG_USB_DWC3' => 'y',
+        'CONFIG_USB_DWC3_PCI' => 'y',
+        'CONFIG_FB_EFI' => 'y',

         'CONFIG_BACKLIGHT_CLASS_DEVICE' => 'y',
         'CONFIG_BACKLIGHT_CLASS_DEVICE' => 'y',

-        'CONFIG_BACKLIGHT_GPIO' => 'y',
-        'CONFIG_TYPEC_TPS6598X' => 'm',
+        'CONFIG_BACKLIGHT_GPIO' => 'm',
+        'CONFIG_TYPEC_TPS6598X' => 'y',

         'CONFIG_BT_HCIBCM4377' => 'm',
         'CONFIG_HID_DOCKCHANNEL' => 'm',
         'CONFIG_APPLE_DOCKCHANNEL' => 'm',
         'CONFIG_BT_HCIBCM4377' => 'm',
         'CONFIG_HID_DOCKCHANNEL' => 'm',
         'CONFIG_APPLE_DOCKCHANNEL' => 'm',