Merge branch 'gpd-pocket' into 'master'

Fix Cherry Trail power management regression

See merge request kernel-team/linux!203

2 files changed, 43 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 27592d73f604..3a221cc62569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,29 @@ linux (5.8-1~exp1) UNRELEASED; urgency=medium
 
   * New upstream release: https://kernelnewbies.org/Linux_5.8
 
+  [ Jeremy Stanley ]
+  * [x86] PMIC operation region support (Closes: #925965)
+    - Enable CONFIG_PMIC_OPREGION for general ACPI support of operation
+      regions with Power Management Integrated Circuits. Turn on specific
+      opregion support for:
+      + CONFIG_BYTCRC_PMIC_OPREGION (Bay Trail Crystal Cove PMIC)
+      + CONFIG_CHTCRC_PMIC_OPREGION (Cherry Trail Crystal Cove PMIC)
+      + CONFIG_XPOWER_PMIC_OPREGION (XPower AXP288 PMIC)
+      + CONFIG_BXT_WC_PMIC_OPREGION (BXT WhiskeyCove PMIC)
+      + CONFIG_CHT_WC_PMIC_OPREGION (CHT Whiskey Cove PMIC)
+      + CONFIG_CHT_DC_TI_PMIC_OPREGION (Dollar Cove TI PMIC)
+      Additionally enable CONFIG_MFD_INTEL_PMC_BXT as a module (multi-function
+      device driver for Intel Broxton Whiskey Cove PMIC), along with
+      CONFIG_INTEL_SOC_PMIC (Crystal Cove PMIC) as a dependency for it.
+  * [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.
+
   [ Romain Perier ]
   * Rebased patches onto 5.8.
 
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 9e5f3abbd193..1b787865dc12 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -187,6 +187,13 @@ CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
 CONFIG_ACPI_EXTLOG=y
+CONFIG_PMIC_OPREGION=y
+CONFIG_BYTCRC_PMIC_OPREGION=y
+CONFIG_CHTCRC_PMIC_OPREGION=y
+CONFIG_XPOWER_PMIC_OPREGION=y
+CONFIG_BXT_WC_PMIC_OPREGION=y
+CONFIG_CHT_WC_PMIC_OPREGION=y
+CONFIG_CHT_DC_TI_PMIC_OPREGION=y
 CONFIG_X86_PM_TIMER=y
 
 ##
@@ -669,7 +676,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
@@ -891,11 +898,13 @@ CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_MFD_AXP20X_I2C=m
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 CONFIG_LPC_ICH=m
+CONFIG_INTEL_SOC_PMIC=y
 CONFIG_INTEL_SOC_PMIC_BXTWC=m
 CONFIG_INTEL_SOC_PMIC_CHTWC=y
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 CONFIG_MFD_INTEL_LPSS_ACPI=m
 CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_PMC_BXT=m
 CONFIG_MFD_KEMPLD=m
 CONFIG_MFD_MENF21BMC=m
 
@@ -1747,12 +1756,22 @@ CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 
 ##
+## file: drivers/usb/roles/Kconfig
+##
+CONFIG_USB_ROLES_INTEL_XHCI=m
+
+##
 ## file: drivers/usb/typec/Kconfig
 ##
 CONFIG_TYPEC=m
 CONFIG_TYPEC_TPS6598X=m
 
 ##
+## file: drivers/usb/typec/mux/Kconfig
+##
+CONFIG_TYPEC_MUX_PI3USB30532=m
+
+##
 ## file: drivers/usb/typec/tcpm/Kconfig
 ##
 CONFIG_TYPEC_TCPM=m