summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-10-02 10:38:25 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-10-02 10:38:25 +0100
commit54d7d3899256ca76a0ae70ca791c1d804a98a80d (patch)
tree4b2e7bb4943c43df5a40c37039ffbcbf922f2760
parente21e52b60843bc2c19b187cd6d25723686a610dc (diff)
downloadkernel-54d7d3899256ca76a0ae70ca791c1d804a98a80d.tar.gz
kernel-54d7d3899256ca76a0ae70ca791c1d804a98a80d.tar.xz
kernel-54d7d3899256ca76a0ae70ca791c1d804a98a80d.zip
initial Arm 5.4 config updates
-rw-r--r--configs/fedora/generic/CONFIG_SND_HDA_INTEL2
-rw-r--r--configs/fedora/generic/arm/CONFIG_ARM_PSCI_CPUIDLE2
-rw-r--r--configs/fedora/generic/arm/CONFIG_ARM_PSCI_FW1
-rw-r--r--configs/fedora/generic/arm/CONFIG_ARM_TEGRA20_DEVFREQ1
-rw-r--r--configs/fedora/generic/arm/CONFIG_GPIO_MOXTET1
-rw-r--r--configs/fedora/generic/arm/CONFIG_MOXTET1
-rw-r--r--configs/fedora/generic/arm/CONFIG_RTC_DRV_MESON_VRTC2
-rw-r--r--configs/fedora/generic/arm/CONFIG_TCG_FTPM_TEE (renamed from configs/fedora/generic/CONFIG_TCG_FTPM_TEE)0
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_RTC_DRV_FSL_FTM_ALARM2
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_SM_GCC_81501
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_EDAC_ARMADA_XP2
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_ARM_TEGRA20_DEVFREQ1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q021
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL111
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW011
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC11
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA11
-rw-r--r--configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL1
-rw-r--r--configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL_DETECT_DMIC2
-rw-r--r--kernel-aarch64-debug.config15
-rw-r--r--kernel-aarch64.config15
-rw-r--r--kernel-armv7hl-debug.config20
-rw-r--r--kernel-armv7hl-lpae-debug.config13
-rw-r--r--kernel-armv7hl-lpae.config13
-rw-r--r--kernel-armv7hl.config20
-rw-r--r--kernel-i686-debug.config3
-rw-r--r--kernel-i686.config3
-rw-r--r--kernel-ppc64le-debug.config3
-rw-r--r--kernel-ppc64le.config3
-rw-r--r--kernel-s390x-debug.config3
-rw-r--r--kernel-s390x.config3
-rw-r--r--kernel-x86_64-debug.config3
-rw-r--r--kernel-x86_64.config3
34 files changed, 66 insertions, 79 deletions
diff --git a/configs/fedora/generic/CONFIG_SND_HDA_INTEL b/configs/fedora/generic/CONFIG_SND_HDA_INTEL
index dfe74ea98..6f057ecfe 100644
--- a/configs/fedora/generic/CONFIG_SND_HDA_INTEL
+++ b/configs/fedora/generic/CONFIG_SND_HDA_INTEL
@@ -1 +1 @@
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
diff --git a/configs/fedora/generic/arm/CONFIG_ARM_PSCI_CPUIDLE b/configs/fedora/generic/arm/CONFIG_ARM_PSCI_CPUIDLE
index 5d304af48..29843b961 100644
--- a/configs/fedora/generic/arm/CONFIG_ARM_PSCI_CPUIDLE
+++ b/configs/fedora/generic/arm/CONFIG_ARM_PSCI_CPUIDLE
@@ -1 +1 @@
-# CONFIG_ARM_PSCI_CPUIDLE is not set
+CONFIG_ARM_PSCI_CPUIDLE=y
diff --git a/configs/fedora/generic/arm/CONFIG_ARM_PSCI_FW b/configs/fedora/generic/arm/CONFIG_ARM_PSCI_FW
new file mode 100644
index 000000000..8f3a93575
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_ARM_PSCI_FW
@@ -0,0 +1 @@
+CONFIG_ARM_PSCI_FW=y
diff --git a/configs/fedora/generic/arm/CONFIG_ARM_TEGRA20_DEVFREQ b/configs/fedora/generic/arm/CONFIG_ARM_TEGRA20_DEVFREQ
deleted file mode 100644
index 494e80851..000000000
--- a/configs/fedora/generic/arm/CONFIG_ARM_TEGRA20_DEVFREQ
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ARM_TEGRA20_DEVFREQ is not set
diff --git a/configs/fedora/generic/arm/CONFIG_GPIO_MOXTET b/configs/fedora/generic/arm/CONFIG_GPIO_MOXTET
new file mode 100644
index 000000000..14a747e37
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_GPIO_MOXTET
@@ -0,0 +1 @@
+CONFIG_GPIO_MOXTET=m
diff --git a/configs/fedora/generic/arm/CONFIG_MOXTET b/configs/fedora/generic/arm/CONFIG_MOXTET
new file mode 100644
index 000000000..29810388f
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MOXTET
@@ -0,0 +1 @@
+CONFIG_MOXTET=m
diff --git a/configs/fedora/generic/arm/CONFIG_RTC_DRV_MESON_VRTC b/configs/fedora/generic/arm/CONFIG_RTC_DRV_MESON_VRTC
index 41e7719b0..4ae0ab82f 100644
--- a/configs/fedora/generic/arm/CONFIG_RTC_DRV_MESON_VRTC
+++ b/configs/fedora/generic/arm/CONFIG_RTC_DRV_MESON_VRTC
@@ -1 +1 @@
-# CONFIG_RTC_DRV_MESON_VRTC is not set
+CONFIG_RTC_DRV_MESON_VRTC=m
diff --git a/configs/fedora/generic/CONFIG_TCG_FTPM_TEE b/configs/fedora/generic/arm/CONFIG_TCG_FTPM_TEE
index f84ad6543..f84ad6543 100644
--- a/configs/fedora/generic/CONFIG_TCG_FTPM_TEE
+++ b/configs/fedora/generic/arm/CONFIG_TCG_FTPM_TEE
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_RTC_DRV_FSL_FTM_ALARM b/configs/fedora/generic/arm/aarch64/CONFIG_RTC_DRV_FSL_FTM_ALARM
index 703404f40..390851818 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_RTC_DRV_FSL_FTM_ALARM
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_RTC_DRV_FSL_FTM_ALARM
@@ -1 +1 @@
-# CONFIG_RTC_DRV_FSL_FTM_ALARM is not set
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SM_GCC_8150 b/configs/fedora/generic/arm/aarch64/CONFIG_SM_GCC_8150
new file mode 100644
index 000000000..3e341c392
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SM_GCC_8150
@@ -0,0 +1 @@
+CONFIG_SM_GCC_8150=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_EDAC_ARMADA_XP b/configs/fedora/generic/arm/armv7/CONFIG_EDAC_ARMADA_XP
index aac50a620..301caab79 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_EDAC_ARMADA_XP
+++ b/configs/fedora/generic/arm/armv7/CONFIG_EDAC_ARMADA_XP
@@ -1 +1 @@
-# CONFIG_EDAC_ARMADA_XP is not set
+CONFIG_EDAC_ARMADA_XP=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_ARM_TEGRA20_DEVFREQ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_ARM_TEGRA20_DEVFREQ
new file mode 100644
index 000000000..c3c35e684
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_ARM_TEGRA20_DEVFREQ
@@ -0,0 +1 @@
+CONFIG_ARM_TEGRA20_DEVFREQ=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02
deleted file mode 100644
index 59d16a459..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11
deleted file mode 100644
index 8751af145..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01
deleted file mode 100644
index fe01d0a37..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM
deleted file mode 100644
index d4629e2b7..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1
deleted file mode 100644
index de91d35b4..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1
deleted file mode 100644
index 9a503f8e7..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
diff --git a/configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL b/configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL
new file mode 100644
index 000000000..dfe74ea98
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL
@@ -0,0 +1 @@
+CONFIG_SND_HDA_INTEL=m
diff --git a/configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL_DETECT_DMIC b/configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL_DETECT_DMIC
index c0a8ee9a6..501f523b0 100644
--- a/configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL_DETECT_DMIC
+++ b/configs/fedora/generic/x86/CONFIG_SND_HDA_INTEL_DETECT_DMIC
@@ -1 +1 @@
-CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
+# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 86e575028..b532fb05f 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -360,7 +360,8 @@ CONFIG_ARM_MHU=m
CONFIG_ARM_PL172_MPMC=m
CONFIG_ARM_PMU=y
# CONFIG_ARM_PSCI_CHECKER is not set
-# CONFIG_ARM_PSCI_CPUIDLE is not set
+CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_ARM_PSCI_FW=y
CONFIG_ARM_PSCI=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
CONFIG_ARM_QCOM_CPUFREQ_HW=m
@@ -385,7 +386,6 @@ CONFIG_ARM_SPE_PMU=m
CONFIG_ARM_TEGRA124_CPUFREQ=y
CONFIG_ARM_TEGRA186_CPUFREQ=m
# CONFIG_ARM_TEGRA20_CPUFREQ is not set
-# CONFIG_ARM_TEGRA20_DEVFREQ is not set
CONFIG_ARM_TEGRA_DEVFREQ=m
CONFIG_ARM_TIMER_SP804=y
CONFIG_ARMV8_DEPRECATED=y
@@ -2051,6 +2051,7 @@ CONFIG_GPIO_MB86S7X=m
# CONFIG_GPIO_MC33880 is not set
CONFIG_GPIO_MLXBF=m
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MOXTET=m
CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MVEBU=y
CONFIG_GPIO_PCA953X_IRQ=y
@@ -3580,7 +3581,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
CONFIG_MOUSE_VSXXXAA=m
# CONFIG_MOXA_INTELLIO is not set
# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MOXTET is not set
+CONFIG_MOXTET=m
CONFIG_MPL115_I2C=m
# CONFIG_MPL115_SPI is not set
# CONFIG_MPL3115 is not set
@@ -5118,7 +5119,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
-# CONFIG_RTC_DRV_FSL_FTM_ALARM is not set
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
CONFIG_RTC_DRV_HYM8563=m
@@ -5139,7 +5140,7 @@ CONFIG_RTC_DRV_MAX6902=m
CONFIG_RTC_DRV_MAX6916=m
CONFIG_RTC_DRV_MAX77686=m
CONFIG_RTC_DRV_MCP795=m
-# CONFIG_RTC_DRV_MESON_VRTC is not set
+CONFIG_RTC_DRV_MESON_VRTC=m
CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_MV=m
# CONFIG_RTC_DRV_MXC is not set
@@ -5700,7 +5701,7 @@ CONFIG_SMC91X=m
CONFIG_SMC_DIAG=m
CONFIG_SMC=m
# CONFIG_SM_FTL is not set
-# CONFIG_SM_GCC_8150 is not set
+CONFIG_SM_GCC_8150=y
CONFIG_SMP=y
CONFIG_SMSC911X=m
CONFIG_SMSC9420=m
@@ -5791,7 +5792,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
CONFIG_SND_HDA_PREALLOC_SIZE=4096
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 8742f7eaf..75134b3c4 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -360,7 +360,8 @@ CONFIG_ARM_MHU=m
CONFIG_ARM_PL172_MPMC=m
CONFIG_ARM_PMU=y
# CONFIG_ARM_PSCI_CHECKER is not set
-# CONFIG_ARM_PSCI_CPUIDLE is not set
+CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_ARM_PSCI_FW=y
CONFIG_ARM_PSCI=y
# CONFIG_ARM_PTDUMP_DEBUGFS is not set
CONFIG_ARM_QCOM_CPUFREQ_HW=m
@@ -385,7 +386,6 @@ CONFIG_ARM_SPE_PMU=m
CONFIG_ARM_TEGRA124_CPUFREQ=y
CONFIG_ARM_TEGRA186_CPUFREQ=m
# CONFIG_ARM_TEGRA20_CPUFREQ is not set
-# CONFIG_ARM_TEGRA20_DEVFREQ is not set
CONFIG_ARM_TEGRA_DEVFREQ=m
CONFIG_ARM_TIMER_SP804=y
CONFIG_ARMV8_DEPRECATED=y
@@ -2035,6 +2035,7 @@ CONFIG_GPIO_MB86S7X=m
# CONFIG_GPIO_MC33880 is not set
CONFIG_GPIO_MLXBF=m
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MOXTET=m
CONFIG_GPIO_MPC8XXX=y
CONFIG_GPIO_MVEBU=y
CONFIG_GPIO_PCA953X_IRQ=y
@@ -3560,7 +3561,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
CONFIG_MOUSE_VSXXXAA=m
# CONFIG_MOXA_INTELLIO is not set
# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MOXTET is not set
+CONFIG_MOXTET=m
CONFIG_MPL115_I2C=m
# CONFIG_MPL115_SPI is not set
# CONFIG_MPL3115 is not set
@@ -5097,7 +5098,7 @@ CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_FM3130=m
-# CONFIG_RTC_DRV_FSL_FTM_ALARM is not set
+CONFIG_RTC_DRV_FSL_FTM_ALARM=m
# CONFIG_RTC_DRV_FTRTC010 is not set
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
CONFIG_RTC_DRV_HYM8563=m
@@ -5118,7 +5119,7 @@ CONFIG_RTC_DRV_MAX6902=m
CONFIG_RTC_DRV_MAX6916=m
CONFIG_RTC_DRV_MAX77686=m
CONFIG_RTC_DRV_MCP795=m
-# CONFIG_RTC_DRV_MESON_VRTC is not set
+CONFIG_RTC_DRV_MESON_VRTC=m
CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_MV=m
# CONFIG_RTC_DRV_MXC is not set
@@ -5679,7 +5680,7 @@ CONFIG_SMC91X=m
CONFIG_SMC_DIAG=m
CONFIG_SMC=m
# CONFIG_SM_FTL is not set
-# CONFIG_SM_GCC_8150 is not set
+CONFIG_SM_GCC_8150=y
CONFIG_SMP=y
CONFIG_SMSC911X=m
CONFIG_SMSC9420=m
@@ -5770,7 +5771,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
CONFIG_SND_HDA_PREALLOC_SIZE=4096
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index d9582c84a..b7beef6d4 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -352,7 +352,8 @@ CONFIG_ARM_PATCH_IDIV=y
CONFIG_ARM_PL172_MPMC=m
CONFIG_ARM_PMU=y
# CONFIG_ARM_PSCI_CHECKER is not set
-# CONFIG_ARM_PSCI_CPUIDLE is not set
+CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_ARM_PSCI_FW=y
CONFIG_ARM_PSCI=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
CONFIG_ARM_QCOM_CPUFREQ_HW=m
@@ -372,7 +373,7 @@ CONFIG_ARM_SPE_PMU=m
CONFIG_ARM_STI_CPUFREQ=m
CONFIG_ARM_TEGRA124_CPUFREQ=y
CONFIG_ARM_TEGRA20_CPUFREQ=m
-# CONFIG_ARM_TEGRA20_DEVFREQ is not set
+CONFIG_ARM_TEGRA20_DEVFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
CONFIG_ARM_THUMBEE=y
CONFIG_ARM_THUMB=y
@@ -1538,12 +1539,6 @@ CONFIG_DRM_OMAP_ENCODER_OPA362=m
CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
CONFIG_DRM_OMAP=m
CONFIG_DRM_OMAP_PANEL_DSI_CM=m
-CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=m
-CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
-CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m
-CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m
-CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
-CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
CONFIG_DRM_PANEL_ARM_VERSATILE=m
CONFIG_DRM_PANEL_BRIDGE=y
CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
@@ -1749,7 +1744,7 @@ CONFIG_EARLY_PRINTK=y
CONFIG_ECHO=m
CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC_ARMADA_XP is not set
+CONFIG_EDAC_ARMADA_XP=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_GHES=y
CONFIG_EDAC_HIGHBANK_L2=m
@@ -2071,6 +2066,7 @@ CONFIG_GPIO_MAX77650=m
# CONFIG_GPIO_MB86S7X is not set
CONFIG_GPIO_MC33880=m
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MOXTET=m
# CONFIG_GPIO_MPC8XXX is not set
CONFIG_GPIO_MVEBU=y
CONFIG_GPIO_OMAP=y
@@ -3650,7 +3646,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
CONFIG_MOUSE_VSXXXAA=m
# CONFIG_MOXA_INTELLIO is not set
# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MOXTET is not set
+CONFIG_MOXTET=m
CONFIG_MPL115_I2C=m
# CONFIG_MPL115_SPI is not set
CONFIG_MPL3115=m
@@ -5267,7 +5263,7 @@ CONFIG_RTC_DRV_MAX8997=m
CONFIG_RTC_DRV_MC13XXX=m
# CONFIG_RTC_DRV_MCP795 is not set
CONFIG_RTC_DRV_MESON=m
-# CONFIG_RTC_DRV_MESON_VRTC is not set
+CONFIG_RTC_DRV_MESON_VRTC=m
CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_MV=m
# CONFIG_RTC_DRV_MXC is not set
@@ -5942,7 +5938,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
CONFIG_SND_HDA_PREALLOC_SIZE=4096
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 8f434465c..3c23093d1 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -342,7 +342,8 @@ CONFIG_ARM_PATCH_IDIV=y
CONFIG_ARM_PL172_MPMC=m
CONFIG_ARM_PMU=y
# CONFIG_ARM_PSCI_CHECKER is not set
-# CONFIG_ARM_PSCI_CPUIDLE is not set
+CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_ARM_PSCI_FW=y
CONFIG_ARM_PSCI=y
CONFIG_ARM_PTDUMP_DEBUGFS=y
CONFIG_ARM_QCOM_CPUFREQ_HW=m
@@ -361,7 +362,6 @@ CONFIG_ARM_SP805_WATCHDOG=m
CONFIG_ARM_SPE_PMU=m
CONFIG_ARM_TEGRA124_CPUFREQ=y
# CONFIG_ARM_TEGRA20_CPUFREQ is not set
-# CONFIG_ARM_TEGRA20_DEVFREQ is not set
CONFIG_ARM_TEGRA_DEVFREQ=m
CONFIG_ARM_THUMBEE=y
CONFIG_ARM_THUMB=y
@@ -1682,7 +1682,7 @@ CONFIG_EARLY_PRINTK=y
CONFIG_ECHO=m
CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC_ARMADA_XP is not set
+CONFIG_EDAC_ARMADA_XP=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_GHES=y
CONFIG_EDAC_HIGHBANK_L2=m
@@ -2002,6 +2002,7 @@ CONFIG_GPIO_MAX77650=m
# CONFIG_GPIO_MB86S7X is not set
CONFIG_GPIO_MC33880=m
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MOXTET=m
# CONFIG_GPIO_MPC8XXX is not set
CONFIG_GPIO_MVEBU=y
CONFIG_GPIO_PCA953X_IRQ=y
@@ -3531,7 +3532,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
CONFIG_MOUSE_VSXXXAA=m
# CONFIG_MOXA_INTELLIO is not set
# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MOXTET is not set
+CONFIG_MOXTET=m
CONFIG_MPL115_I2C=m
# CONFIG_MPL115_SPI is not set
CONFIG_MPL3115=m
@@ -5025,7 +5026,7 @@ CONFIG_RTC_DRV_MAX77686=m
CONFIG_RTC_DRV_MAX8997=m
# CONFIG_RTC_DRV_MCP795 is not set
CONFIG_RTC_DRV_MESON=m
-# CONFIG_RTC_DRV_MESON_VRTC is not set
+CONFIG_RTC_DRV_MESON_VRTC=m
CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_MV=m
# CONFIG_RTC_DRV_MXC is not set
@@ -5681,7 +5682,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
CONFIG_SND_HDA_PREALLOC_SIZE=4096
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 89757645b..0c82adbcc 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -342,7 +342,8 @@ CONFIG_ARM_PATCH_IDIV=y
CONFIG_ARM_PL172_MPMC=m
CONFIG_ARM_PMU=y
# CONFIG_ARM_PSCI_CHECKER is not set
-# CONFIG_ARM_PSCI_CPUIDLE is not set
+CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_ARM_PSCI_FW=y
CONFIG_ARM_PSCI=y
# CONFIG_ARM_PTDUMP_DEBUGFS is not set
CONFIG_ARM_QCOM_CPUFREQ_HW=m
@@ -361,7 +362,6 @@ CONFIG_ARM_SP805_WATCHDOG=m
CONFIG_ARM_SPE_PMU=m
CONFIG_ARM_TEGRA124_CPUFREQ=y
# CONFIG_ARM_TEGRA20_CPUFREQ is not set
-# CONFIG_ARM_TEGRA20_DEVFREQ is not set
CONFIG_ARM_TEGRA_DEVFREQ=m
CONFIG_ARM_THUMBEE=y
CONFIG_ARM_THUMB=y
@@ -1675,7 +1675,7 @@ CONFIG_EARLY_PRINTK=y
CONFIG_ECHO=m
CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC_ARMADA_XP is not set
+CONFIG_EDAC_ARMADA_XP=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_GHES=y
CONFIG_EDAC_HIGHBANK_L2=m
@@ -1987,6 +1987,7 @@ CONFIG_GPIO_MAX77650=m
# CONFIG_GPIO_MB86S7X is not set
CONFIG_GPIO_MC33880=m
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MOXTET=m
# CONFIG_GPIO_MPC8XXX is not set
CONFIG_GPIO_MVEBU=y
CONFIG_GPIO_PCA953X_IRQ=y
@@ -3512,7 +3513,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
CONFIG_MOUSE_VSXXXAA=m
# CONFIG_MOXA_INTELLIO is not set
# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MOXTET is not set
+CONFIG_MOXTET=m
CONFIG_MPL115_I2C=m
# CONFIG_MPL115_SPI is not set
CONFIG_MPL3115=m
@@ -5005,7 +5006,7 @@ CONFIG_RTC_DRV_MAX77686=m
CONFIG_RTC_DRV_MAX8997=m
# CONFIG_RTC_DRV_MCP795 is not set
CONFIG_RTC_DRV_MESON=m
-# CONFIG_RTC_DRV_MESON_VRTC is not set
+CONFIG_RTC_DRV_MESON_VRTC=m
CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_MV=m
# CONFIG_RTC_DRV_MXC is not set
@@ -5661,7 +5662,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
CONFIG_SND_HDA_PREALLOC_SIZE=4096
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 996968493..81fe4b9f5 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -352,7 +352,8 @@ CONFIG_ARM_PATCH_IDIV=y
CONFIG_ARM_PL172_MPMC=m
CONFIG_ARM_PMU=y
# CONFIG_ARM_PSCI_CHECKER is not set
-# CONFIG_ARM_PSCI_CPUIDLE is not set
+CONFIG_ARM_PSCI_CPUIDLE=y
+CONFIG_ARM_PSCI_FW=y
CONFIG_ARM_PSCI=y
# CONFIG_ARM_PTDUMP_DEBUGFS is not set
CONFIG_ARM_QCOM_CPUFREQ_HW=m
@@ -372,7 +373,7 @@ CONFIG_ARM_SPE_PMU=m
CONFIG_ARM_STI_CPUFREQ=m
CONFIG_ARM_TEGRA124_CPUFREQ=y
CONFIG_ARM_TEGRA20_CPUFREQ=m
-# CONFIG_ARM_TEGRA20_DEVFREQ is not set
+CONFIG_ARM_TEGRA20_DEVFREQ=m
CONFIG_ARM_TEGRA_DEVFREQ=m
CONFIG_ARM_THUMBEE=y
CONFIG_ARM_THUMB=y
@@ -1531,12 +1532,6 @@ CONFIG_DRM_OMAP_ENCODER_OPA362=m
CONFIG_DRM_OMAP_ENCODER_TPD12S015=m
CONFIG_DRM_OMAP=m
CONFIG_DRM_OMAP_PANEL_DSI_CM=m
-CONFIG_DRM_OMAP_PANEL_LGPHILIPS_LB035Q02=m
-CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
-CONFIG_DRM_OMAP_PANEL_SHARP_LS037V7DW01=m
-CONFIG_DRM_OMAP_PANEL_SONY_ACX565AKM=m
-CONFIG_DRM_OMAP_PANEL_TPO_TD028TTEC1=m
-CONFIG_DRM_OMAP_PANEL_TPO_TD043MTEA1=m
CONFIG_DRM_PANEL_ARM_VERSATILE=m
CONFIG_DRM_PANEL_BRIDGE=y
CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
@@ -1742,7 +1737,7 @@ CONFIG_EARLY_PRINTK=y
CONFIG_ECHO=m
CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
-# CONFIG_EDAC_ARMADA_XP is not set
+CONFIG_EDAC_ARMADA_XP=y
# CONFIG_EDAC_DEBUG is not set
CONFIG_EDAC_GHES=y
CONFIG_EDAC_HIGHBANK_L2=m
@@ -2056,6 +2051,7 @@ CONFIG_GPIO_MAX77650=m
# CONFIG_GPIO_MB86S7X is not set
CONFIG_GPIO_MC33880=m
# CONFIG_GPIO_MOCKUP is not set
+CONFIG_GPIO_MOXTET=m
# CONFIG_GPIO_MPC8XXX is not set
CONFIG_GPIO_MVEBU=y
CONFIG_GPIO_OMAP=y
@@ -3631,7 +3627,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
CONFIG_MOUSE_VSXXXAA=m
# CONFIG_MOXA_INTELLIO is not set
# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_MOXTET is not set
+CONFIG_MOXTET=m
CONFIG_MPL115_I2C=m
# CONFIG_MPL115_SPI is not set
CONFIG_MPL3115=m
@@ -5247,7 +5243,7 @@ CONFIG_RTC_DRV_MAX8997=m
CONFIG_RTC_DRV_MC13XXX=m
# CONFIG_RTC_DRV_MCP795 is not set
CONFIG_RTC_DRV_MESON=m
-# CONFIG_RTC_DRV_MESON_VRTC is not set
+CONFIG_RTC_DRV_MESON_VRTC=m
CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_MV=m
# CONFIG_RTC_DRV_MXC is not set
@@ -5922,7 +5918,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
CONFIG_SND_HDA_PREALLOC_SIZE=4096
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 66582a46a..e469c1d32 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -5263,7 +5263,7 @@ CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
+# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
@@ -5728,7 +5728,6 @@ CONFIG_TASK_XACCT=y
CONFIG_TC1100_WMI=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_CRB=y
-CONFIG_TCG_FTPM_TEE=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_I2C_ATMEL is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 3f8ebe8c7..1d5e6f962 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -5243,7 +5243,7 @@ CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
+# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
@@ -5707,7 +5707,6 @@ CONFIG_TASK_XACCT=y
CONFIG_TC1100_WMI=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_CRB=y
-CONFIG_TCG_FTPM_TEE=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_I2C_ATMEL is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 31bfb177e..39aac6973 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4939,7 +4939,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDA_PREALLOC_SIZE=4096
@@ -5340,7 +5340,6 @@ CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m
CONFIG_TCG_CRB=y
-CONFIG_TCG_FTPM_TEE=m
# CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_I2C_ATMEL is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 970e3f97d..29a25c20e 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4917,7 +4917,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDA_PREALLOC_SIZE=4096
@@ -5317,7 +5317,6 @@ CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m
CONFIG_TCG_CRB=y
-CONFIG_TCG_FTPM_TEE=m
# CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_I2C_ATMEL is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 26d01b430..83b12ee0d 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4883,7 +4883,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDA_PREALLOC_SIZE=4096
@@ -5277,7 +5277,6 @@ CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m
CONFIG_TCG_CRB=y
-CONFIG_TCG_FTPM_TEE=m
# CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_I2C_ATMEL is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 0ae907c13..69ee97c19 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4861,7 +4861,7 @@ CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
-CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL is not set
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
CONFIG_SND_HDA_PREALLOC_SIZE=4096
@@ -5254,7 +5254,6 @@ CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m
CONFIG_TCG_CRB=y
-CONFIG_TCG_FTPM_TEE=m
# CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_I2C_ATMEL is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index e5a54dfdb..2f4a72cf7 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5310,7 +5310,7 @@ CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
+# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
@@ -5778,7 +5778,6 @@ CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m
CONFIG_TCG_CRB=y
-CONFIG_TCG_FTPM_TEE=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_I2C_ATMEL is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index f1bd843d1..b13dce46f 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5290,7 +5290,7 @@ CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_I915=y
CONFIG_SND_HDA_INPUT_BEEP_MODE=0
CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
+# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_PATCH_LOADER=y
CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
@@ -5757,7 +5757,6 @@ CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m
CONFIG_TCG_CRB=y
-CONFIG_TCG_FTPM_TEE=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_NSC=m
# CONFIG_TCG_TIS_I2C_ATMEL is not set