diff --git a/config b/config
index 1beffbc1b5e8..f97f3cb1f1ce 100644
--- a/config
+++ b/config
@@ -559,8 +559,13 @@ CONFIG_ACPI_APEI_ERST_DEBUG=m
 CONFIG_DPTF_POWER=m
 # CONFIG_ACPI_EXTLOG is not set
 CONFIG_ACPI_ADXL=y
-CONFIG_BYTPMIC_OPREGION=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_ACPI_CONFIGFS=m
 CONFIG_X86_PM_TIMER=y
 # CONFIG_SFI is not set
@@ -730,6 +735,7 @@ CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
 CONFIG_OPTPROBES=y
 CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_KRETPROBES=y
@@ -1857,6 +1863,7 @@ CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_RTL=y
 CONFIG_BT_HCIUART_QCA=y
 # CONFIG_BT_HCIUART_AG6XX is not set
@@ -2142,6 +2149,7 @@ CONFIG_SYS_HYPERVISOR=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP_MMIO=y
@@ -4056,6 +4064,7 @@ CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_REGULATOR_HAPTIC=m
 CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
@@ -4207,6 +4216,8 @@ CONFIG_SERIAL_MEN_Z135=m
 # end of Serial drivers
 
 CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 CONFIG_TTY_PRINTK=y
 CONFIG_TTY_PRINTK_LEVEL=6
 CONFIG_PRINTER=m
@@ -4281,6 +4292,8 @@ CONFIG_XILLYBUS_PCIE=m
 #
 # I2C support
 #
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
@@ -4320,6 +4333,7 @@ CONFIG_I2C_I801=m
 CONFIG_I2C_ISCH=m
 CONFIG_I2C_ISMT=m
 CONFIG_I2C_PIIX4=m
+CONFIG_I2C_CHT_WC=m
 CONFIG_I2C_NFORCE2=m
 CONFIG_I2C_NFORCE2_S4985=m
 CONFIG_I2C_NVIDIA_GPU=m
@@ -4338,6 +4352,8 @@ CONFIG_I2C_SCMI=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
@@ -4465,6 +4481,7 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
 CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_MCP23S08=m
+# CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=m
 CONFIG_PINCTRL_INTEL=m
@@ -4529,6 +4546,7 @@ CONFIG_GPIO_PCF857X=m
 # MFD GPIO expanders
 #
 CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_CRYSTAL_COVE=y
 CONFIG_GPIO_DA9052=m
 CONFIG_GPIO_DLN2=m
 CONFIG_GPIO_JANZ_TTL=m
@@ -4537,6 +4555,7 @@ CONFIG_GPIO_LP3943=m
 # CONFIG_GPIO_MADERA is not set
 CONFIG_GPIO_TPS65912=m
 # CONFIG_GPIO_UCB1400 is not set
+CONFIG_GPIO_WHISKEY_COVE=y
 CONFIG_GPIO_WM8994=m
 # end of MFD GPIO expanders
 
@@ -4624,6 +4643,9 @@ CONFIG_BATTERY_SBS=m
 CONFIG_MANAGER_SBS=m
 # CONFIG_BATTERY_BQ27XXX is not set
 CONFIG_BATTERY_DA9052=m
+# CONFIG_AXP20X_POWER is not set
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 # CONFIG_BATTERY_MAX1721X is not set
@@ -4981,8 +5003,13 @@ CONFIG_BCMA_DEBUG=y
 # Multifunction device drivers
 #
 CONFIG_MFD_CORE=y
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
 CONFIG_MFD_BCM590XX=m
 # CONFIG_MFD_BD9571MWV is not set
+CONFIG_MFD_AXP20X=y
+CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_CROS_EC_DEV=m
 CONFIG_MFD_MADERA=y
 # CONFIG_MFD_MADERA_I2C is not set
@@ -4992,8 +5019,11 @@ CONFIG_MFD_MADERA=y
 # CONFIG_MFD_CS47L85 is not set
 # CONFIG_MFD_CS47L90 is not set
 # CONFIG_MFD_CS47L92 is not set
+# CONFIG_PMIC_DA903X is not set
 CONFIG_PMIC_DA9052=y
 CONFIG_MFD_DA9052_SPI=y
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
 CONFIG_MFD_DA9062=m
 CONFIG_MFD_DA9063=m
 # CONFIG_MFD_DA9150 is not set
@@ -5002,9 +5032,13 @@ CONFIG_MFD_MC13XXX=m
 CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_MC13XXX_I2C=m
 CONFIG_HTC_PASIC3=m
+# CONFIG_HTC_I2CPLD is not set
 CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
+CONFIG_INTEL_SOC_PMIC=y
+CONFIG_INTEL_SOC_PMIC_BXTWC=y
+CONFIG_INTEL_SOC_PMIC_CHTWC=y
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 CONFIG_MFD_INTEL_LPSS=m
 CONFIG_MFD_INTEL_LPSS_ACPI=m
@@ -5013,9 +5047,14 @@ CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_KEMPLD=m
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
 # CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
 CONFIG_MFD_MT6397=m
 CONFIG_MFD_MENF21BMC=m
 # CONFIG_EZX_PCAP is not set
@@ -5027,23 +5066,35 @@ CONFIG_PCF50633_GPIO=m
 CONFIG_UCB1400_CORE=m
 CONFIG_MFD_RDC321X=m
 # CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_SEC_CORE is not set
 CONFIG_MFD_SI476X_CORE=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SKY81452=m
+# CONFIG_MFD_SMSC is not set
 # CONFIG_ABX500_CORE is not set
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_MFD_LP3943=m
+# CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_PALMAS is not set
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 # CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TPS68470 is not set
 # CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
 CONFIG_MFD_TPS65912=y
 # CONFIG_MFD_TPS65912_I2C is not set
 CONFIG_MFD_TPS65912_SPI=y
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_LM3533=m
 # CONFIG_MFD_TQMX86 is not set
@@ -5056,7 +5107,10 @@ CONFIG_MFD_WM5102=y
 CONFIG_MFD_WM5110=y
 CONFIG_MFD_WM8997=y
 # CONFIG_MFD_WM8998 is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
 CONFIG_MFD_WM8994=m
 # CONFIG_RAVE_SP_CORE is not set
 # end of Multifunction device drivers
@@ -5072,6 +5126,7 @@ CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ANATOP=m
 # CONFIG_REGULATOR_ARIZONA_LDO1 is not set
 # CONFIG_REGULATOR_ARIZONA_MICSUPP is not set
+# CONFIG_REGULATOR_AXP20X is not set
 CONFIG_REGULATOR_BCM590XX=m
 CONFIG_REGULATOR_DA9052=m
 # CONFIG_REGULATOR_DA9062 is not set
@@ -7133,6 +7188,7 @@ CONFIG_TYPEC_TCPM=m
 CONFIG_TYPEC_TCPCI=m
 CONFIG_TYPEC_RT1711H=m
 CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_WCOVE=m
 CONFIG_TYPEC_UCSI=m
 # CONFIG_UCSI_CCG is not set
 CONFIG_UCSI_ACPI=m
@@ -7414,6 +7470,7 @@ CONFIG_RTC_DRV_RS5C348=m
 CONFIG_RTC_DRV_MAX6902=m
 CONFIG_RTC_DRV_PCF2123=m
 CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
 
 #
 # SPI and I2C RTC drivers
@@ -7980,6 +8037,7 @@ CONFIG_SAMSUNG_Q10=m
 CONFIG_APPLE_GMUX=m
 CONFIG_INTEL_RST=m
 CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_INTEL_PMC_IPC=y
 CONFIG_INTEL_BXTWC_PMIC_TMU=m
 CONFIG_SURFACE_PRO3_BUTTON=m
 CONFIG_SURFACE_3_BUTTON=m
@@ -7987,7 +8045,10 @@ CONFIG_INTEL_PUNIT_IPC=m
 # CONFIG_INTEL_TELEMETRY is not set
 CONFIG_MLX_PLATFORM=m
 # CONFIG_INTEL_TURBO_MAX_3 is not set
+CONFIG_TOUCHSCREEN_DMI=y
 CONFIG_INTEL_CHTDC_TI_PWRBTN=m
+CONFIG_I2C_MULTI_INSTANTIATE=m
+CONFIG_INTEL_ATOMISP2_PM=m
 CONFIG_HUAWEI_WMI=m
 # CONFIG_PCENGINES_APU2 is not set
 
@@ -8154,8 +8215,11 @@ CONFIG_EXTCON=y
 #
 CONFIG_EXTCON_ADC_JACK=m
 # CONFIG_EXTCON_ARIZONA is not set
+CONFIG_EXTCON_AXP288=m
 # CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_INT3496=m
+CONFIG_EXTCON_INTEL_CHT_WC=m
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_PTN5150 is not set
 CONFIG_EXTCON_RT8973A=m
@@ -8237,6 +8301,8 @@ CONFIG_AD7887=m
 CONFIG_AD7923=m
 # CONFIG_AD7949 is not set
 CONFIG_AD799X=m
+# CONFIG_AXP20X_ADC is not set
+CONFIG_AXP288_ADC=m
 CONFIG_CC10001_ADC=m
 # CONFIG_DLN2_ADC is not set
 CONFIG_HI8435=m
@@ -8649,6 +8715,7 @@ CONFIG_VMIVME_7805=m
 CONFIG_VME_USER=m
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
+CONFIG_PWM_CRC=y
 # CONFIG_PWM_CROS_EC is not set
 CONFIG_PWM_LP3943=m
 CONFIG_PWM_LPSS=m
@@ -9944,38 +10011,3 @@ CONFIG_MEMTEST=y
 # CONFIG_HYPERV_TESTING is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
-CONFIG_CRC_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_BT_HCIUART_BCM=y
-CONFIG_REGMAP_I2C=y
-CONFIG_INPUT_AXP20X_PEK=m
-CONFIG_SERIAL_DEV_BUS=y
-CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
-CONFIG_I2C=y
-CONFIG_ACPI_I2C_OPREGION=y
-CONFIG_I2C_CHT_WC=m
-CONFIG_I2C_DESIGNWARE_CORE=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
-CONFIG_GPIO_CRYSTAL_COVE=y
-CONFIG_GPIO_WHISKEY_COVE=y
-CONFIG_AXP288_CHARGER=m
-CONFIG_AXP288_FUEL_GAUGE=m
-CONFIG_MFD_AXP20X=y
-CONFIG_MFD_AXP20X_I2C=y
-CONFIG_INTEL_SOC_PMIC=y
-CONFIG_INTEL_SOC_PMIC_BXTWC=y
-CONFIG_INTEL_SOC_PMIC_CHTWC=y
-CONFIG_TYPEC_WCOVE=m
-CONFIG_RTC_I2C_AND_SPI=y
-CONFIG_INTEL_PMC_IPC=y
-CONFIG_TOUCHSCREEN_DMI=y
-CONFIG_I2C_MULTI_INSTANTIATE=m
-CONFIG_INTEL_ATOMISP2_PM=m
-CONFIG_EXTCON_AXP288=m
-CONFIG_EXTCON_INTEL_INT3496=m
-CONFIG_EXTCON_INTEL_CHT_WC=m
-CONFIG_AXP288_ADC=m
-CONFIG_PWM_CRC=y