minor config cleanups and driver renames

28 files changed, 35 insertions, 54 deletions

diff --git a/baseconfig/CONFIG_INPUT_MPU3050 b/baseconfig/CONFIG_INPUT_MPU3050
deleted file mode 100644
index 7c1afe068..000000000
--- a/baseconfig/CONFIG_INPUT_MPU3050
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_MPU3050=m
diff --git a/baseconfig/CONFIG_MPU3050_I2C b/baseconfig/CONFIG_MPU3050_I2C
index 92e6cbf51..2e9c7cc45 100644
--- a/baseconfig/CONFIG_MPU3050_I2C
+++ b/baseconfig/CONFIG_MPU3050_I2C
@@ -1 +1 @@
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_AK8975 b/baseconfig/arm/CONFIG_AK8975
index 547c21a99..547c21a99 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_AK8975
+++ b/baseconfig/arm/CONFIG_AK8975
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9 b/baseconfig/arm/CONFIG_KXSD9
index 090669c9c..090669c9c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9
+++ b/baseconfig/arm/CONFIG_KXSD9
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_I2C b/baseconfig/arm/CONFIG_KXSD9_I2C
index 3d2256700..3d2256700 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_I2C
+++ b/baseconfig/arm/CONFIG_KXSD9_I2C
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_SPI b/baseconfig/arm/CONFIG_KXSD9_SPI
index f4da57bbc..f4da57bbc 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_KXSD9_SPI
+++ b/baseconfig/arm/CONFIG_KXSD9_SPI
diff --git a/baseconfig/arm/armv7/CONFIG_MFD_PM8921_CORE b/baseconfig/arm/armv7/CONFIG_MFD_PM8921_CORE
deleted file mode 100644
index 226d75be9..000000000
--- a/baseconfig/arm/armv7/CONFIG_MFD_PM8921_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_PM8921_CORE is not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C b/baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C
deleted file mode 100644
index 2e9c7cc45..000000000
--- a/baseconfig/arm/armv7/armv7/CONFIG_MPU3050_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MPU3050_I2C=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3f81bd79c..67deecfba 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -171,7 +171,7 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000
 CONFIG_AIX_PARTITION=y
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
-# CONFIG_AK8975 is not set
+CONFIG_AK8975=m
 # CONFIG_AL3320A is not set
 CONFIG_ALI_FIR=m
 CONFIG_ALIM1535_WDT=m
@@ -2200,7 +2200,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -2610,7 +2609,9 @@ CONFIG_KSZ884X_PCI=m
 CONFIG_KUSER_HELPERS=y
 CONFIG_KVM=y
 CONFIG_KXCJK1013=m
-# CONFIG_KXSD9 is not set
+CONFIG_KXSD9_I2C=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
 CONFIG_L2TP_DEBUGFS=m
 CONFIG_L2TP_ETH=m
 CONFIG_L2TP_IP=m
@@ -3135,7 +3136,7 @@ CONFIG_MOVABLE_NODE=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 832aa62ff..c600220f1 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -171,7 +171,7 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000
 CONFIG_AIX_PARTITION=y
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
-# CONFIG_AK8975 is not set
+CONFIG_AK8975=m
 # CONFIG_AL3320A is not set
 CONFIG_ALI_FIR=m
 CONFIG_ALIM1535_WDT=m
@@ -2183,7 +2183,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -2591,7 +2590,9 @@ CONFIG_KSZ884X_PCI=m
 CONFIG_KUSER_HELPERS=y
 CONFIG_KVM=y
 CONFIG_KXCJK1013=m
-# CONFIG_KXSD9 is not set
+CONFIG_KXSD9_I2C=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
 CONFIG_L2TP_DEBUGFS=m
 CONFIG_L2TP_ETH=m
 CONFIG_L2TP_IP=m
@@ -3114,7 +3115,7 @@ CONFIG_MOVABLE_NODE=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 1e8d9934a..134cd13d7 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2350,7 +2350,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PALMAS_PWRBUTTON=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
@@ -3151,7 +3150,6 @@ CONFIG_MFD_NVEC=y
 CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_PALMAS=y
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_PM8921_CORE is not set
 CONFIG_MFD_PM8XXX=m
 CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RC5T583 is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 4d5a5298c..d061701c3 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -149,7 +149,7 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000
 CONFIG_AIX_PARTITION=y
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
-# CONFIG_AK8975 is not set
+CONFIG_AK8975=m
 # CONFIG_AL3320A is not set
 CONFIG_ALI_FIR=m
 CONFIG_ALIM1535_WDT=m
@@ -2229,7 +2229,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -2654,7 +2653,9 @@ CONFIG_KUSER_HELPERS=y
 CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM=y
 CONFIG_KXCJK1013=m
-# CONFIG_KXSD9 is not set
+CONFIG_KXSD9_I2C=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
 CONFIG_L2TP_DEBUGFS=m
 CONFIG_L2TP_ETH=m
 CONFIG_L2TP_IP=m
@@ -3006,7 +3007,6 @@ CONFIG_MFD_MAX8997=y
 # CONFIG_MFD_NVEC is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_PM8921_CORE is not set
 # CONFIG_MFD_PM8XXX is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
@@ -3197,7 +3197,7 @@ CONFIG_MPL115=m
 CONFIG_MPL3115=m
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 493b93292..22190420e 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -149,7 +149,7 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000
 CONFIG_AIX_PARTITION=y
 # CONFIG_AK09911 is not set
 # CONFIG_AK8974 is not set
-# CONFIG_AK8975 is not set
+CONFIG_AK8975=m
 # CONFIG_AL3320A is not set
 CONFIG_ALI_FIR=m
 CONFIG_ALIM1535_WDT=m
@@ -2212,7 +2212,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -2635,7 +2634,9 @@ CONFIG_KUSER_HELPERS=y
 CONFIG_KVM_ARM_HOST=y
 CONFIG_KVM=y
 CONFIG_KXCJK1013=m
-# CONFIG_KXSD9 is not set
+CONFIG_KXSD9_I2C=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
 CONFIG_L2TP_DEBUGFS=m
 CONFIG_L2TP_ETH=m
 CONFIG_L2TP_IP=m
@@ -2986,7 +2987,6 @@ CONFIG_MFD_MAX8997=y
 # CONFIG_MFD_NVEC is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_PM8921_CORE is not set
 # CONFIG_MFD_PM8XXX is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
@@ -3176,7 +3176,7 @@ CONFIG_MPL115=m
 CONFIG_MPL3115=m
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 71f677c09..be52c3628 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2333,7 +2333,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PALMAS_PWRBUTTON=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
@@ -3131,7 +3130,6 @@ CONFIG_MFD_NVEC=y
 CONFIG_MFD_OMAP_USB_HOST=y
 CONFIG_MFD_PALMAS=y
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_PM8921_CORE is not set
 CONFIG_MFD_PM8XXX=m
 CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RC5T583 is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 8c9191d7e..d6f456a6d 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2071,7 +2071,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -3027,7 +3026,7 @@ CONFIG_MPILIB=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 28cca58e5..b9bcdf0ab 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2089,7 +2089,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -3047,7 +3046,7 @@ CONFIG_MPILIB=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index bd214d7e1..1ac4c227e 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2089,7 +2089,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -3047,7 +3046,7 @@ CONFIG_MPILIB=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index d6501ebcf..fbc1de15a 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2071,7 +2071,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -3027,7 +3026,7 @@ CONFIG_MPILIB=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 3f43bfeda..c1fc50524 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1986,7 +1986,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PCSPKR is not set
@@ -2886,7 +2885,7 @@ CONFIG_MOVABLE_NODE=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index c391bcd62..6e5ffaa38 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1968,7 +1968,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PCSPKR is not set
@@ -2864,7 +2863,7 @@ CONFIG_MOVABLE_NODE=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index b187162f4..6d0d43144 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1932,7 +1932,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PCSPKR is not set
@@ -2831,7 +2830,7 @@ CONFIG_MOVABLE_NODE=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index a4e6bca7a..e45c701c2 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1914,7 +1914,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PCSPKR is not set
@@ -2809,7 +2808,7 @@ CONFIG_MOVABLE_NODE=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index f441afb10..170a1dcf7 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -1931,7 +1931,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PCSPKR is not set
@@ -2830,7 +2829,7 @@ CONFIG_MOVABLE_NODE=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 2b8f16745..11d36ce54 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -1913,7 +1913,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 # CONFIG_INPUT_PCSPKR is not set
@@ -2808,7 +2807,7 @@ CONFIG_MOVABLE_NODE=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 8aa42f5f0..46f9cc490 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1880,7 +1880,6 @@ CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -2766,7 +2765,7 @@ CONFIG_MOVABLE_NODE=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 263b2798e..c54282995 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1862,7 +1862,6 @@ CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -2744,7 +2743,7 @@ CONFIG_MOVABLE_NODE=y
 # CONFIG_MPL3115 is not set
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index c7cbf8ff2..ff82ac3f8 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2134,7 +2134,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -3091,7 +3090,7 @@ CONFIG_MPILIB=y
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPSC is not set
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index fa8f3f7d0..a2cf99883 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2116,7 +2116,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_PCF50633_PMU=m
 # CONFIG_INPUT_PCF8574 is not set
 CONFIG_INPUT_PCSPKR=m
@@ -3071,7 +3070,7 @@ CONFIG_MPILIB=y
 CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPSC is not set
-# CONFIG_MPU3050_I2C is not set
+CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_MQ_IOSCHED_KYBER=m
 # CONFIG_MS5611 is not set