aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Stanley <fungi@yuggoth.org>2020-01-26 16:47:24 +0000
committerJeremy Stanley <fungi@yuggoth.org>2020-08-16 17:15:37 +0000
commitd5c998412628563e86efc90c3ff1be01b0bd397f (patch)
tree7d8b14694b8f0306cab7d914c8c006806ca291c6
parent52ec3499509838c3c26c1225a66d6188838b19db (diff)
downloadkernel_replicant_linux-d5c998412628563e86efc90c3ff1be01b0bd397f.tar.gz
kernel_replicant_linux-d5c998412628563e86efc90c3ff1be01b0bd397f.tar.bz2
kernel_replicant_linux-d5c998412628563e86efc90c3ff1be01b0bd397f.zip
[x86] Restore Cherry Trail Whiskey Cove PMIC driver
Switch CONFIG_I2C_DESIGNWARE_PLATFORM from being compiled as a module to compiled into the kernel directly, since as of kernel version 5.1 this state became a dependency for CONFIG_INTEL_SOC_PMIC_CHTWC which is already enabled.
-rw-r--r--debian/changelog6
-rw-r--r--debian/config/kernelarch-x86/config2
2 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index db96a89dc0d3..2fd894b65268 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,11 @@ linux (5.8-1~exp1) UNRELEASED; urgency=medium
* New upstream release: https://kernelnewbies.org/Linux_5.8
[ Jeremy Stanley ]
- * [x86] Fix Cherry Trail power management regression
+ * [x86] Fix Cherry Trail power management regression (Closes: #949886)
+ - Switch CONFIG_I2C_DESIGNWARE_PLATFORM from being compiled as a module to
+ compiled into the kernel directly, since as of kernel version 5.1 this
+ state became a dependency for CONFIG_INTEL_SOC_PMIC_CHTWC which is
+ already enabled.
- Enable CONFIG_USB_ROLES_INTEL_XHCI and CONFIG_TYPEC_MUX_PI3USB30532 as
modules, which became dependencies for the already enabled
CONFIG_INTEL_CHT_INT33FE as of kernel version 4.17.
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 8e9db11f5dbb..ee3b988d6496 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -669,7 +669,7 @@ CONFIG_I2C_VIA=m
CONFIG_I2C_VIAPRO=m
CONFIG_I2C_SCMI=m
#. Sony Vaio Duo 13".
-CONFIG_I2C_DESIGNWARE_PLATFORM=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
CONFIG_I2C_DESIGNWARE_PCI=m
CONFIG_I2C_KEMPLD=m