Arm config updates for 5.2rc1

41 files changed, 114 insertions, 89 deletions

diff --git a/configs/fedora/generic/CONFIG_MFD_STMFX b/configs/fedora/generic/CONFIG_MFD_STMFX
index 6fcbadc26..480542e98 100644
--- a/configs/fedora/generic/CONFIG_MFD_STMFX
+++ b/configs/fedora/generic/CONFIG_MFD_STMFX
@@ -1 +1 @@
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
diff --git a/configs/fedora/generic/CONFIG_SENSORS_OCC_P9_SBE b/configs/fedora/generic/CONFIG_SENSORS_OCC_P9_SBE
new file mode 100644
index 000000000..d4d390083
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SENSORS_OCC_P9_SBE
@@ -0,0 +1 @@
+# CONFIG_SENSORS_OCC_P9_SBE is not set
diff --git a/configs/fedora/generic/CONFIG_SND_SOC_IMX_AUDMIX b/configs/fedora/generic/CONFIG_SND_SOC_IMX_AUDMIX
index fb66a2340..e286a5f22 100644
--- a/configs/fedora/generic/CONFIG_SND_SOC_IMX_AUDMIX
+++ b/configs/fedora/generic/CONFIG_SND_SOC_IMX_AUDMIX
@@ -1 +1 @@
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
diff --git a/configs/fedora/generic/CONFIG_THERMAL_MMIO b/configs/fedora/generic/CONFIG_THERMAL_MMIO
index db4895f59..004769c5f 100644
--- a/configs/fedora/generic/CONFIG_THERMAL_MMIO
+++ b/configs/fedora/generic/CONFIG_THERMAL_MMIO
@@ -1 +1 @@
-CONFIG_THERMAL_MMIO=m
+# CONFIG_THERMAL_MMIO is not set
diff --git a/configs/fedora/generic/arm/CONFIG_ARM_GIC_PM b/configs/fedora/generic/arm/CONFIG_ARM_GIC_PM
index 7548668ba..8c4e75c2f 100644
--- a/configs/fedora/generic/arm/CONFIG_ARM_GIC_PM
+++ b/configs/fedora/generic/arm/CONFIG_ARM_GIC_PM
@@ -1 +1 @@
-CONFIG_ARM_GIC_PM=m
+CONFIG_ARM_GIC_PM=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_GPIO_MAX732X b/configs/fedora/generic/arm/CONFIG_GPIO_MAX732X
index 972022c9b..972022c9b 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_GPIO_MAX732X
+++ b/configs/fedora/generic/arm/CONFIG_GPIO_MAX732X
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_GPCV2_PM_DOMAINS b/configs/fedora/generic/arm/CONFIG_IMX_GPCV2_PM_DOMAINS
index f45e4aedd..f45e4aedd 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_IMX_GPCV2_PM_DOMAINS
+++ b/configs/fedora/generic/arm/CONFIG_IMX_GPCV2_PM_DOMAINS
diff --git a/configs/fedora/generic/arm/CONFIG_PHY_MESON_G12A_USB3_PCIE b/configs/fedora/generic/arm/CONFIG_PHY_MESON_G12A_USB3_PCIE
index bd3a64f9c..33ee793de 100644
--- a/configs/fedora/generic/arm/CONFIG_PHY_MESON_G12A_USB3_PCIE
+++ b/configs/fedora/generic/arm/CONFIG_PHY_MESON_G12A_USB3_PCIE
@@ -1 +1 @@
-CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
diff --git a/configs/fedora/generic/arm/CONFIG_PINCTRL_SUNRISEPOINT b/configs/fedora/generic/arm/CONFIG_PINCTRL_SUNRISEPOINT
deleted file mode 100644
index 65dae4805..000000000
--- a/configs/fedora/generic/arm/CONFIG_PINCTRL_SUNRISEPOINT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
diff --git a/configs/fedora/generic/arm/CONFIG_RESET_IMX7 b/configs/fedora/generic/arm/CONFIG_RESET_IMX7
new file mode 100644
index 000000000..6718265f9
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_RESET_IMX7
@@ -0,0 +1 @@
+CONFIG_RESET_IMX7=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SENSORS_ISL29018 b/configs/fedora/generic/arm/CONFIG_SENSORS_ISL29018
index 320ffdd2a..320ffdd2a 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_SENSORS_ISL29018
+++ b/configs/fedora/generic/arm/CONFIG_SENSORS_ISL29018
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SENSORS_ISL29028 b/configs/fedora/generic/arm/CONFIG_SENSORS_ISL29028
index 7b7b44eb9..7b7b44eb9 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_SENSORS_ISL29028
+++ b/configs/fedora/generic/arm/CONFIG_SENSORS_ISL29028
diff --git a/configs/fedora/generic/arm/CONFIG_THERMAL_MMIO b/configs/fedora/generic/arm/CONFIG_THERMAL_MMIO
new file mode 100644
index 000000000..db4895f59
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_THERMAL_MMIO
@@ -0,0 +1 @@
+CONFIG_THERMAL_MMIO=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CLK_QORIQ b/configs/fedora/generic/arm/aarch64/CONFIG_CLK_QORIQ
new file mode 100644
index 000000000..b05638e5c
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_CLK_QORIQ
@@ -0,0 +1 @@
+# CONFIG_CLK_QORIQ is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DP83867_PHY b/configs/fedora/generic/arm/aarch64/CONFIG_DP83867_PHY
new file mode 100644
index 000000000..5ba3d57bd
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_DP83867_PHY
@@ -0,0 +1 @@
+CONFIG_DP83867_PHY=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN8I_H3_R b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN8I_H3_R
deleted file mode 100644
index 53ace8c1c..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_SUN8I_H3_R
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PINCTRL_SUN8I_H3_R=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_QORIQ_THERMAL b/configs/fedora/generic/arm/aarch64/CONFIG_QORIQ_THERMAL
new file mode 100644
index 000000000..b84faf52a
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_QORIQ_THERMAL
@@ -0,0 +1 @@
+CONFIG_QORIQ_THERMAL=m
diff --git a/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_AUDMIX b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_FSL_AUDMIX
index e4cad6188..e4cad6188 100644
--- a/configs/fedora/generic/arm/CONFIG_SND_SOC_FSL_AUDMIX
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_FSL_AUDMIX
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_IMX_AUDMIX b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_IMX_AUDMIX
new file mode 100644
index 000000000..fb66a2340
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_IMX_AUDMIX
@@ -0,0 +1 @@
+CONFIG_SND_SOC_IMX_AUDMIX=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_STM32_ROMEM b/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_STM32_ROMEM
new file mode 100644
index 000000000..4168dfbdb
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_STM32_ROMEM
@@ -0,0 +1 @@
+CONFIG_NVMEM_STM32_ROMEM=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_SUN9I_A80 b/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_SUN9I_A80
index a2318f212..4cf7a1bfa 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_SUN9I_A80
+++ b/configs/fedora/generic/arm/armv7/CONFIG_PINCTRL_SUN9I_A80
@@ -1 +1 @@
-# CONFIG_PINCTRL_SUN9I_A80 is not set
+CONFIG_PINCTRL_SUN9I_A80=y
diff --git a/configs/fedora/generic/arm/CONFIG_REGULATOR_STM32_PWR b/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_STM32_PWR
index 6c3d65efe..6c3d65efe 100644
--- a/configs/fedora/generic/arm/CONFIG_REGULATOR_STM32_PWR
+++ b/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_STM32_PWR
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_STM32_TIMER_CNT b/configs/fedora/generic/arm/armv7/CONFIG_STM32_TIMER_CNT
new file mode 100644
index 000000000..e266b020b
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_STM32_TIMER_CNT
@@ -0,0 +1 @@
+CONFIG_STM32_TIMER_CNT=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_IMX_OCOTP b/configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_IMX_OCOTP
deleted file mode 100644
index b5e278063..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_IMX_OCOTP
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NVMEM_IMX_OCOTP=m
diff --git a/configs/fedora/generic/powerpc/CONFIG_SENSORS_OCC_P8_I2C b/configs/fedora/generic/powerpc/CONFIG_SENSORS_OCC_P8_I2C
deleted file mode 100644
index e885832f9..000000000
--- a/configs/fedora/generic/powerpc/CONFIG_SENSORS_OCC_P8_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_OCC_P8_I2C=m
diff --git a/configs/fedora/generic/powerpc/CONFIG_SENSORS_OCC_P9_SBE b/configs/fedora/generic/powerpc/CONFIG_SENSORS_OCC_P9_SBE
deleted file mode 100644
index fb426072f..000000000
--- a/configs/fedora/generic/powerpc/CONFIG_SENSORS_OCC_P9_SBE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_OCC_P9_SBE=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 89536a8b8..7f757d740 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -339,7 +339,7 @@ CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DSU_PMU=m
-CONFIG_ARM_GIC_PM=m
+CONFIG_ARM_GIC_PM=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3=y
@@ -1406,7 +1406,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DP83640_PHY=m
 CONFIG_DP83822_PHY=m
 CONFIG_DP83848_PHY=m
-# CONFIG_DP83867_PHY is not set
+CONFIG_DP83867_PHY=m
 # CONFIG_DP83TC811_PHY is not set
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1990,7 +1990,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX3191X is not set
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_MAX77620=y
 CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_MB86S7X=m
@@ -2445,6 +2445,7 @@ CONFIG_IMA=y
 CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 # CONFIG_IMX_DMA is not set
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
@@ -3366,7 +3367,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_SPMI_PMIC=m
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SUN4I_GPADC is not set
@@ -4468,7 +4469,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_MESON_G12A_USB2=y
-CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
 CONFIG_PHY_MESON_GXL_USB2=m
 CONFIG_PHY_MESON_GXL_USB3=m
 CONFIG_PHY_MVEBU_A3700_COMPHY=m
@@ -4566,11 +4567,10 @@ CONFIG_PINCTRL_SUN50I_H6=y
 # CONFIG_PINCTRL_SUN8I_A83T is not set
 # CONFIG_PINCTRL_SUN8I_A83T_R is not set
 # CONFIG_PINCTRL_SUN8I_H3 is not set
-CONFIG_PINCTRL_SUN8I_H3_R=y
+# CONFIG_PINCTRL_SUN8I_H3_R is not set
 # CONFIG_PINCTRL_SUN8I_V3S is not set
 # CONFIG_PINCTRL_SUN9I_A80 is not set
 # CONFIG_PINCTRL_SUN9I_A80_R is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
@@ -4786,7 +4786,7 @@ CONFIG_QLGE=m
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
 # CONFIG_QORIQ_CPUFREQ is not set
-# CONFIG_QORIQ_THERMAL is not set
+CONFIG_QORIQ_THERMAL=m
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
 CONFIG_QRTR_TUN=m
@@ -4914,7 +4914,6 @@ CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_RK808=y
-CONFIG_REGULATOR_STM32_PWR=y
 CONFIG_REGULATOR_SY8106A=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
@@ -4942,6 +4941,7 @@ CONFIG_REMOTEPROC=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_HISI=y
+CONFIG_RESET_IMX7=y
 CONFIG_RESET_MESON_AUDIO_ARB=m
 CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_QCOM_PDC=m
@@ -5400,8 +5400,8 @@ CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA3221=m
 # CONFIG_SENSORS_IR35221 is not set
 # CONFIG_SENSORS_IR38064 is not set
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
 # CONFIG_SENSORS_ISL68137 is not set
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
@@ -5463,6 +5463,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index aeb872c1c..ed167ee26 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -339,7 +339,7 @@ CONFIG_ARM_CRYPTO=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DSU_PMU=m
-CONFIG_ARM_GIC_PM=m
+CONFIG_ARM_GIC_PM=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3=y
@@ -1398,7 +1398,7 @@ CONFIG_DNS_RESOLVER=m
 CONFIG_DP83640_PHY=m
 CONFIG_DP83822_PHY=m
 CONFIG_DP83848_PHY=m
-# CONFIG_DP83867_PHY is not set
+CONFIG_DP83867_PHY=m
 # CONFIG_DP83TC811_PHY is not set
 CONFIG_DPOT_DAC=m
 CONFIG_DRAGONRISE_FF=y
@@ -1974,7 +1974,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX3191X is not set
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_MAX77620=y
 CONFIG_GPIO_MAX77650=m
 CONFIG_GPIO_MB86S7X=m
@@ -2429,6 +2429,7 @@ CONFIG_IMA=y
 CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 # CONFIG_IMX_DMA is not set
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
@@ -3347,7 +3348,7 @@ CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_SPMI_PMIC=m
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SUN4I_GPADC is not set
@@ -4448,7 +4449,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_MESON_G12A_USB2=y
-CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
 CONFIG_PHY_MESON_GXL_USB2=m
 CONFIG_PHY_MESON_GXL_USB3=m
 CONFIG_PHY_MVEBU_A3700_COMPHY=m
@@ -4546,11 +4547,10 @@ CONFIG_PINCTRL_SUN50I_H6=y
 # CONFIG_PINCTRL_SUN8I_A83T is not set
 # CONFIG_PINCTRL_SUN8I_A83T_R is not set
 # CONFIG_PINCTRL_SUN8I_H3 is not set
-CONFIG_PINCTRL_SUN8I_H3_R=y
+# CONFIG_PINCTRL_SUN8I_H3_R is not set
 # CONFIG_PINCTRL_SUN8I_V3S is not set
 # CONFIG_PINCTRL_SUN9I_A80 is not set
 # CONFIG_PINCTRL_SUN9I_A80_R is not set
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
@@ -4765,7 +4765,7 @@ CONFIG_QLGE=m
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX6FS_FS is not set
 # CONFIG_QORIQ_CPUFREQ is not set
-# CONFIG_QORIQ_THERMAL is not set
+CONFIG_QORIQ_THERMAL=m
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
 CONFIG_QRTR_TUN=m
@@ -4893,7 +4893,6 @@ CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_RK808=y
-CONFIG_REGULATOR_STM32_PWR=y
 CONFIG_REGULATOR_SY8106A=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
@@ -4921,6 +4920,7 @@ CONFIG_REMOTEPROC=m
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_HISI=y
+CONFIG_RESET_IMX7=y
 CONFIG_RESET_MESON_AUDIO_ARB=m
 CONFIG_RESET_QCOM_AOSS=y
 CONFIG_RESET_QCOM_PDC=m
@@ -5379,8 +5379,8 @@ CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA3221=m
 # CONFIG_SENSORS_IR35221 is not set
 # CONFIG_SENSORS_IR38064 is not set
-# CONFIG_SENSORS_ISL29018 is not set
-# CONFIG_SENSORS_ISL29028 is not set
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
 # CONFIG_SENSORS_ISL68137 is not set
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
@@ -5442,6 +5442,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index fe9bae883..7bfab7072 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -325,7 +325,7 @@ CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
-CONFIG_ARM_GIC_PM=m
+CONFIG_ARM_GIC_PM=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3=y
@@ -3444,7 +3444,7 @@ CONFIG_MFD_SM501=m
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_STM32_LPTIMER=m
 CONFIG_MFD_STM32_TIMERS=m
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 CONFIG_MFD_STMPE=y
 # CONFIG_MFD_STPMIC1 is not set
 CONFIG_MFD_SUN4I_GPADC=m
@@ -4590,7 +4590,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_MESON_G12A_USB2=y
-CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MESON_GXL_USB3=m
 CONFIG_PHY_MIPHY28LP=m
@@ -4689,9 +4689,8 @@ CONFIG_PINCTRL_SUN8I_A83T=y
 CONFIG_PINCTRL_SUN8I_H3_R=y
 CONFIG_PINCTRL_SUN8I_H3=y
 CONFIG_PINCTRL_SUN8I_V3S=y
-# CONFIG_PINCTRL_SUN9I_A80 is not set
 CONFIG_PINCTRL_SUN9I_A80_R=y
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
+CONFIG_PINCTRL_SUN9I_A80=y
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ZYNQ=y
@@ -5085,6 +5084,7 @@ CONFIG_REMOTEPROC=m
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_IMX7=y
 CONFIG_RESET_MESON_AUDIO_ARB=m
 # CONFIG_RESET_QCOM_AOSS is not set
 CONFIG_RESET_QCOM_PDC=m
@@ -5624,6 +5624,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -6033,7 +6034,7 @@ CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_FSL_ASRC=m
-CONFIG_SND_SOC_FSL_AUDMIX=m
+# CONFIG_SND_SOC_FSL_AUDMIX is not set
 CONFIG_SND_SOC_FSL_ESAI=m
 # CONFIG_SND_SOC_FSL_MICFIL is not set
 CONFIG_SND_SOC_FSL_SAI=m
@@ -6047,7 +6048,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_MC13783=m
@@ -6405,6 +6406,7 @@ CONFIG_STM32_EXTI=y
 CONFIG_STM32_LPTIMER_CNT=m
 CONFIG_STM32_MDMA=y
 CONFIG_STM32_THERMAL=m
+CONFIG_STM32_TIMER_CNT=m
 CONFIG_STM32_WATCHDOG=m
 # CONFIG_STM is not set
 CONFIG_STMMAC_ETH=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index b4769c86c..2d8314e9f 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -316,7 +316,7 @@ CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
-CONFIG_ARM_GIC_PM=m
+CONFIG_ARM_GIC_PM=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3=y
@@ -2402,6 +2402,7 @@ CONFIG_IMA=y
 CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 # CONFIG_IMX_DMA is not set
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
@@ -3332,7 +3333,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_STM32_LPTIMER=m
 CONFIG_MFD_STM32_TIMERS=m
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 CONFIG_MFD_SUN4I_GPADC=m
@@ -4425,7 +4426,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_MESON_G12A_USB2=y
-CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MESON_GXL_USB3=m
 # CONFIG_PHY_MVEBU_A3700_COMPHY is not set
@@ -4507,9 +4508,8 @@ CONFIG_PINCTRL_SUN8I_A83T=y
 CONFIG_PINCTRL_SUN8I_H3_R=y
 CONFIG_PINCTRL_SUN8I_H3=y
 CONFIG_PINCTRL_SUN8I_V3S=y
-# CONFIG_PINCTRL_SUN9I_A80 is not set
 CONFIG_PINCTRL_SUN9I_A80_R=y
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
+CONFIG_PINCTRL_SUN9I_A80=y
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
@@ -4850,6 +4850,7 @@ CONFIG_REMOTEPROC=m
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_IMX7=y
 CONFIG_RESET_MESON_AUDIO_ARB=m
 # CONFIG_RESET_QCOM_AOSS is not set
 CONFIG_RESET_QCOM_PDC=m
@@ -5374,6 +5375,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -5764,7 +5766,7 @@ CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_FSL_ASRC=m
-CONFIG_SND_SOC_FSL_AUDMIX=m
+# CONFIG_SND_SOC_FSL_AUDMIX is not set
 CONFIG_SND_SOC_FSL_ESAI=m
 # CONFIG_SND_SOC_FSL_MICFIL is not set
 CONFIG_SND_SOC_FSL_SAI=m
@@ -5777,7 +5779,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -6083,6 +6085,7 @@ CONFIG_STM32_EXTI=y
 CONFIG_STM32_LPTIMER_CNT=m
 CONFIG_STM32_MDMA=y
 CONFIG_STM32_THERMAL=m
+CONFIG_STM32_TIMER_CNT=m
 CONFIG_STM32_WATCHDOG=m
 # CONFIG_STM is not set
 CONFIG_STMMAC_ETH=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 416f9f6b8..43a4426fe 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -316,7 +316,7 @@ CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
-CONFIG_ARM_GIC_PM=m
+CONFIG_ARM_GIC_PM=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3=y
@@ -2387,6 +2387,7 @@ CONFIG_IMA=y
 CONFIG_IMX2_WDT=m
 CONFIG_IMX7D_ADC=m
 # CONFIG_IMX_DMA is not set
+CONFIG_IMX_GPCV2_PM_DOMAINS=y
 CONFIG_IMX_GPCV2=y
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
@@ -3314,7 +3315,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_STM32_LPTIMER=m
 CONFIG_MFD_STM32_TIMERS=m
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 CONFIG_MFD_SUN4I_GPADC=m
@@ -4406,7 +4407,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_MESON_G12A_USB2=y
-CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MESON_GXL_USB3=m
 # CONFIG_PHY_MVEBU_A3700_COMPHY is not set
@@ -4488,9 +4489,8 @@ CONFIG_PINCTRL_SUN8I_A83T=y
 CONFIG_PINCTRL_SUN8I_H3_R=y
 CONFIG_PINCTRL_SUN8I_H3=y
 CONFIG_PINCTRL_SUN8I_V3S=y
-# CONFIG_PINCTRL_SUN9I_A80 is not set
 CONFIG_PINCTRL_SUN9I_A80_R=y
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
+CONFIG_PINCTRL_SUN9I_A80=y
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
@@ -4830,6 +4830,7 @@ CONFIG_REMOTEPROC=m
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_IMX7=y
 CONFIG_RESET_MESON_AUDIO_ARB=m
 # CONFIG_RESET_QCOM_AOSS is not set
 CONFIG_RESET_QCOM_PDC=m
@@ -5354,6 +5355,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -5743,7 +5745,7 @@ CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_FSL_ASRC=m
-CONFIG_SND_SOC_FSL_AUDMIX=m
+# CONFIG_SND_SOC_FSL_AUDMIX is not set
 CONFIG_SND_SOC_FSL_ESAI=m
 # CONFIG_SND_SOC_FSL_MICFIL is not set
 CONFIG_SND_SOC_FSL_SAI=m
@@ -5756,7 +5758,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -6062,6 +6064,7 @@ CONFIG_STM32_EXTI=y
 CONFIG_STM32_LPTIMER_CNT=m
 CONFIG_STM32_MDMA=y
 CONFIG_STM32_THERMAL=m
+CONFIG_STM32_TIMER_CNT=m
 CONFIG_STM32_WATCHDOG=m
 # CONFIG_STM is not set
 CONFIG_STMMAC_ETH=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 5cc5b8dc2..581eee733 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -325,7 +325,7 @@ CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
-CONFIG_ARM_GIC_PM=m
+CONFIG_ARM_GIC_PM=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_ARM_GIC_V3=y
@@ -3426,7 +3426,7 @@ CONFIG_MFD_SM501=m
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_STM32_LPTIMER=m
 CONFIG_MFD_STM32_TIMERS=m
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 CONFIG_MFD_STMPE=y
 # CONFIG_MFD_STPMIC1 is not set
 CONFIG_MFD_SUN4I_GPADC=m
@@ -4571,7 +4571,7 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_MESON_G12A_USB2=y
-CONFIG_PHY_MESON_G12A_USB3_PCIE=y
+CONFIG_PHY_MESON_G12A_USB3_PCIE=m
 # CONFIG_PHY_MESON_GXL_USB2 is not set
 CONFIG_PHY_MESON_GXL_USB3=m
 CONFIG_PHY_MIPHY28LP=m
@@ -4670,9 +4670,8 @@ CONFIG_PINCTRL_SUN8I_A83T=y
 CONFIG_PINCTRL_SUN8I_H3_R=y
 CONFIG_PINCTRL_SUN8I_H3=y
 CONFIG_PINCTRL_SUN8I_V3S=y
-# CONFIG_PINCTRL_SUN9I_A80 is not set
 CONFIG_PINCTRL_SUN9I_A80_R=y
-# CONFIG_PINCTRL_SUNRISEPOINT is not set
+CONFIG_PINCTRL_SUN9I_A80=y
 # CONFIG_PINCTRL_SX150X is not set
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_ZYNQ=y
@@ -5065,6 +5064,7 @@ CONFIG_REMOTEPROC=m
 # CONFIG_RENESAS_PHY is not set
 # CONFIG_RESET_ATTACK_MITIGATION is not set
 CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_IMX7=y
 CONFIG_RESET_MESON_AUDIO_ARB=m
 # CONFIG_RESET_QCOM_AOSS is not set
 CONFIG_RESET_QCOM_PDC=m
@@ -5604,6 +5604,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -6012,7 +6013,7 @@ CONFIG_SND_SOC_ES8328_SPI=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
 CONFIG_SND_SOC_FSL_ASOC_CARD=m
 CONFIG_SND_SOC_FSL_ASRC=m
-CONFIG_SND_SOC_FSL_AUDMIX=m
+# CONFIG_SND_SOC_FSL_AUDMIX is not set
 CONFIG_SND_SOC_FSL_ESAI=m
 # CONFIG_SND_SOC_FSL_MICFIL is not set
 CONFIG_SND_SOC_FSL_SAI=m
@@ -6026,7 +6027,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_MC13783=m
@@ -6384,6 +6385,7 @@ CONFIG_STM32_EXTI=y
 CONFIG_STM32_LPTIMER_CNT=m
 CONFIG_STM32_MDMA=y
 CONFIG_STM32_THERMAL=m
+CONFIG_STM32_TIMER_CNT=m
 CONFIG_STM32_WATCHDOG=m
 # CONFIG_STM is not set
 CONFIG_STMMAC_ETH=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 6e4eca1f5..701b8f899 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3125,7 +3125,7 @@ CONFIG_MFD_MAX77650=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SYSCON is not set
@@ -4992,6 +4992,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -5351,7 +5352,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -5763,7 +5764,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_MMIO=m
+# CONFIG_THERMAL_MMIO is not set
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 7848abbc9..c167b1395 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3106,7 +3106,7 @@ CONFIG_MFD_MAX77650=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SYSCON is not set
@@ -4972,6 +4972,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -5330,7 +5331,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -5742,7 +5743,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_MMIO=m
+# CONFIG_THERMAL_MMIO is not set
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 4bb4f532a..734631427 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2874,7 +2874,7 @@ CONFIG_MFD_MAX77650=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SYSCON is not set
@@ -4680,8 +4680,8 @@ CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
-CONFIG_SENSORS_OCC_P9_SBE=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -5036,7 +5036,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -5398,7 +5398,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_MMIO=m
+# CONFIG_THERMAL_MMIO is not set
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_STATISTICS=y
 # CONFIG_THERMAL_WRITABLE_TRIPS is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 018469fe1..2e4da1a63 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2854,7 +2854,7 @@ CONFIG_MFD_MAX77650=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SYSCON is not set
@@ -4658,8 +4658,8 @@ CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
-CONFIG_SENSORS_OCC_P8_I2C=m
-CONFIG_SENSORS_OCC_P9_SBE=m
+# CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -5013,7 +5013,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -5375,7 +5375,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_MMIO=m
+# CONFIG_THERMAL_MMIO is not set
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_STATISTICS=y
 # CONFIG_THERMAL_WRITABLE_TRIPS is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 924df7f77..56ff01267 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2849,7 +2849,7 @@ CONFIG_MFD_MAX77650=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SMSC is not set
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SYSCON is not set
@@ -4629,6 +4629,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -4980,7 +4981,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -5337,7 +5338,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_THERMAL_HWMON=y
 # CONFIG_THERMAL is not set
-CONFIG_THERMAL_MMIO=m
+# CONFIG_THERMAL_MMIO is not set
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_STATISTICS=y
 # CONFIG_THERMAL_WRITABLE_TRIPS is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index c028ec4af..0fba56161 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2829,7 +2829,7 @@ CONFIG_MFD_MAX77650=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_SMSC is not set
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SYSCON is not set
@@ -4607,6 +4607,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -4957,7 +4958,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -5314,7 +5315,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 CONFIG_THERMAL_HWMON=y
 # CONFIG_THERMAL is not set
-CONFIG_THERMAL_MMIO=m
+# CONFIG_THERMAL_MMIO is not set
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_STATISTICS=y
 # CONFIG_THERMAL_WRITABLE_TRIPS is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index e335d11d8..85307493f 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3178,7 +3178,7 @@ CONFIG_MFD_MAX77650=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SYSCON is not set
@@ -5038,6 +5038,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -5404,7 +5405,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -5819,7 +5820,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_MMIO=m
+# CONFIG_THERMAL_MMIO is not set
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 21c43fd83..4e4a04070 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3159,7 +3159,7 @@ CONFIG_MFD_MAX77650=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
-CONFIG_MFD_STMFX=m
+# CONFIG_MFD_STMFX is not set
 # CONFIG_MFD_STMPE is not set
 # CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_SYSCON is not set
@@ -5018,6 +5018,7 @@ CONFIG_SENSORS_NCT7904=m
 CONFIG_SENSORS_NPCM7XX=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
+# CONFIG_SENSORS_OCC_P9_SBE is not set
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
@@ -5383,7 +5384,7 @@ CONFIG_SND_SOC_HDAC_HDA=m
 CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SOC_IMX_AUDMIX=m
+# CONFIG_SND_SOC_IMX_AUDMIX is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -5798,7 +5799,7 @@ CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_THERMAL_HWMON=y
-CONFIG_THERMAL_MMIO=m
+# CONFIG_THERMAL_MMIO is not set
 # CONFIG_THERMAL_OF is not set
 CONFIG_THERMAL_STATISTICS=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
diff --git a/kernel.spec b/kernel.spec
index d81c424b6..b4281e5fa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1817,6 +1817,9 @@ fi
 #
 #
 %changelog
+* Sun May 19 2019 Peter Robinson <pbrobinson@fedoraproject.org>
+- Arm config updates
+
 * Fri May 17 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc0.git9.1
 - Linux v5.1-12505-g0ef0fd351550