diff --git a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI
index 7be3065fc..6c9f11d2e 100644
--- a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI
+++ b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI
@@ -1 +1 @@
-CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
diff --git a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI
index 93a430846..89c6ed411 100644
--- a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI
+++ b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI
@@ -1 +1 @@
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_PCI=y
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 1b0be4a65..bfc34e075 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -3096,8 +3096,8 @@ CONFIG_MFD_CS5535=y
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 14098ba19..203183ff0 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -3077,8 +3077,8 @@ CONFIG_MFD_CS5535=y
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 36bd621d6..aa0b8b9ad 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -3144,8 +3144,8 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 1fd145a4e..6f410b9fc 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -3125,8 +3125,8 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_DA9150 is not set
 # CONFIG_MFD_DLN2 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
diff --git a/kernel.spec b/kernel.spec
index 084ff5861..dccffbe8f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2889,6 +2889,10 @@ fi
 #
 #
 %changelog
+* Mon Jan 06 2020 Hans de Goede <hdegoede@redhat.com>
+- Make the MFD Intel LPSS driver builtin, some devices require this to be
+  available early during boot (rhbz#1787997)
+
 * Mon Jan 06 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc5.git0.1
 - Linux v5.5-rc5