summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configs/fedora/generic/CONFIG_MFD_CROS_EC_DEV1
-rw-r--r--configs/fedora/generic/arm/CONFIG_MFD_CROS_EC1
-rw-r--r--configs/fedora/generic/arm/CONFIG_MFD_CROS_EC_DEV1
-rw-r--r--configs/fedora/generic/x86/CONFIG_CROS_EC2
-rw-r--r--configs/fedora/generic/x86/CONFIG_CROS_EC_I2C1
-rw-r--r--configs/fedora/generic/x86/CONFIG_CROS_EC_LPC1
-rw-r--r--configs/fedora/generic/x86/CONFIG_CROS_EC_PROTO1
-rw-r--r--configs/fedora/generic/x86/CONFIG_CROS_EC_SPI1
-rw-r--r--configs/fedora/generic/x86/CONFIG_EXTCON_USBC_CROS_EC1
-rw-r--r--configs/fedora/generic/x86/CONFIG_I2C_CROS_EC_TUNNEL1
-rw-r--r--configs/fedora/generic/x86/CONFIG_IIO_CROS_EC_SENSORS_CORE1
-rw-r--r--configs/fedora/generic/x86/CONFIG_KEYBOARD_CROS_EC1
-rw-r--r--configs/fedora/generic/x86/CONFIG_PWM_CROS_EC1
-rw-r--r--configs/fedora/generic/x86/CONFIG_RTC_DRV_CROS_EC1
-rw-r--r--configs/fedora/generic/x86/CONFIG_SND_SOC_CROS_EC_CODEC1
-rw-r--r--configs/fedora/generic/x86/CONFIG_VIDEO_CROS_EC_CEC1
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_MFD_CROS_EC1
-rw-r--r--configs/fedora/generic/x86/x86_64/CONFIG_MFD_CROS_EC_DEV1
-rw-r--r--kernel-aarch64-debug.config4
-rw-r--r--kernel-aarch64.config4
-rw-r--r--kernel-armv7hl-debug.config4
-rw-r--r--kernel-armv7hl-lpae-debug.config4
-rw-r--r--kernel-armv7hl-lpae.config4
-rw-r--r--kernel-armv7hl.config4
-rw-r--r--kernel-i686-debug.config16
-rw-r--r--kernel-i686.config16
-rw-r--r--kernel-ppc64le-debug.config1
-rw-r--r--kernel-ppc64le.config1
-rw-r--r--kernel-s390x-debug.config1
-rw-r--r--kernel-s390x.config1
-rw-r--r--kernel-x86_64-debug.config11
-rw-r--r--kernel-x86_64.config11
32 files changed, 27 insertions, 74 deletions
diff --git a/configs/fedora/generic/CONFIG_MFD_CROS_EC_DEV b/configs/fedora/generic/CONFIG_MFD_CROS_EC_DEV
deleted file mode 100644
index a3f848d39..000000000
--- a/configs/fedora/generic/CONFIG_MFD_CROS_EC_DEV
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MFD_CROS_EC_DEV is not set
diff --git a/configs/fedora/generic/arm/CONFIG_MFD_CROS_EC b/configs/fedora/generic/arm/CONFIG_MFD_CROS_EC
deleted file mode 100644
index 3600231f6..000000000
--- a/configs/fedora/generic/arm/CONFIG_MFD_CROS_EC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_CROS_EC=m
diff --git a/configs/fedora/generic/arm/CONFIG_MFD_CROS_EC_DEV b/configs/fedora/generic/arm/CONFIG_MFD_CROS_EC_DEV
new file mode 100644
index 000000000..a4fd1512e
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MFD_CROS_EC_DEV
@@ -0,0 +1 @@
+CONFIG_MFD_CROS_EC_DEV=m
diff --git a/configs/fedora/generic/x86/CONFIG_CROS_EC b/configs/fedora/generic/x86/CONFIG_CROS_EC
index 1ad522e6a..bd6dd449b 100644
--- a/configs/fedora/generic/x86/CONFIG_CROS_EC
+++ b/configs/fedora/generic/x86/CONFIG_CROS_EC
@@ -1 +1 @@
-CONFIG_CROS_EC=m
+# CONFIG_CROS_EC is not set
diff --git a/configs/fedora/generic/x86/CONFIG_CROS_EC_I2C b/configs/fedora/generic/x86/CONFIG_CROS_EC_I2C
deleted file mode 100644
index 67550eb9c..000000000
--- a/configs/fedora/generic/x86/CONFIG_CROS_EC_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CROS_EC_I2C=m
diff --git a/configs/fedora/generic/x86/CONFIG_CROS_EC_LPC b/configs/fedora/generic/x86/CONFIG_CROS_EC_LPC
deleted file mode 100644
index 7de54fecd..000000000
--- a/configs/fedora/generic/x86/CONFIG_CROS_EC_LPC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CROS_EC_LPC is not set
diff --git a/configs/fedora/generic/x86/CONFIG_CROS_EC_PROTO b/configs/fedora/generic/x86/CONFIG_CROS_EC_PROTO
deleted file mode 100644
index 96a1e9bcb..000000000
--- a/configs/fedora/generic/x86/CONFIG_CROS_EC_PROTO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CROS_EC_PROTO=y
diff --git a/configs/fedora/generic/x86/CONFIG_CROS_EC_SPI b/configs/fedora/generic/x86/CONFIG_CROS_EC_SPI
deleted file mode 100644
index 54b52bed4..000000000
--- a/configs/fedora/generic/x86/CONFIG_CROS_EC_SPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CROS_EC_SPI=m
diff --git a/configs/fedora/generic/x86/CONFIG_EXTCON_USBC_CROS_EC b/configs/fedora/generic/x86/CONFIG_EXTCON_USBC_CROS_EC
deleted file mode 100644
index 06a7e44b6..000000000
--- a/configs/fedora/generic/x86/CONFIG_EXTCON_USBC_CROS_EC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXTCON_USBC_CROS_EC is not set
diff --git a/configs/fedora/generic/x86/CONFIG_I2C_CROS_EC_TUNNEL b/configs/fedora/generic/x86/CONFIG_I2C_CROS_EC_TUNNEL
deleted file mode 100644
index 01606add6..000000000
--- a/configs/fedora/generic/x86/CONFIG_I2C_CROS_EC_TUNNEL
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_CROS_EC_TUNNEL is not set
diff --git a/configs/fedora/generic/x86/CONFIG_IIO_CROS_EC_SENSORS_CORE b/configs/fedora/generic/x86/CONFIG_IIO_CROS_EC_SENSORS_CORE
deleted file mode 100644
index 9a7ec394f..000000000
--- a/configs/fedora/generic/x86/CONFIG_IIO_CROS_EC_SENSORS_CORE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
diff --git a/configs/fedora/generic/x86/CONFIG_KEYBOARD_CROS_EC b/configs/fedora/generic/x86/CONFIG_KEYBOARD_CROS_EC
deleted file mode 100644
index 051955397..000000000
--- a/configs/fedora/generic/x86/CONFIG_KEYBOARD_CROS_EC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_KEYBOARD_CROS_EC is not set
diff --git a/configs/fedora/generic/x86/CONFIG_PWM_CROS_EC b/configs/fedora/generic/x86/CONFIG_PWM_CROS_EC
deleted file mode 100644
index 5e2b1eb81..000000000
--- a/configs/fedora/generic/x86/CONFIG_PWM_CROS_EC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PWM_CROS_EC is not set
diff --git a/configs/fedora/generic/x86/CONFIG_RTC_DRV_CROS_EC b/configs/fedora/generic/x86/CONFIG_RTC_DRV_CROS_EC
deleted file mode 100644
index f4844f71a..000000000
--- a/configs/fedora/generic/x86/CONFIG_RTC_DRV_CROS_EC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_RTC_DRV_CROS_EC is not set
diff --git a/configs/fedora/generic/x86/CONFIG_SND_SOC_CROS_EC_CODEC b/configs/fedora/generic/x86/CONFIG_SND_SOC_CROS_EC_CODEC
deleted file mode 100644
index ee20b04c0..000000000
--- a/configs/fedora/generic/x86/CONFIG_SND_SOC_CROS_EC_CODEC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_CROS_EC_CODEC is not set
diff --git a/configs/fedora/generic/x86/CONFIG_VIDEO_CROS_EC_CEC b/configs/fedora/generic/x86/CONFIG_VIDEO_CROS_EC_CEC
deleted file mode 100644
index 180ec3f10..000000000
--- a/configs/fedora/generic/x86/CONFIG_VIDEO_CROS_EC_CEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_VIDEO_CROS_EC_CEC=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_MFD_CROS_EC b/configs/fedora/generic/x86/x86_64/CONFIG_MFD_CROS_EC
deleted file mode 100644
index 3600231f6..000000000
--- a/configs/fedora/generic/x86/x86_64/CONFIG_MFD_CROS_EC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_CROS_EC=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_MFD_CROS_EC_DEV b/configs/fedora/generic/x86/x86_64/CONFIG_MFD_CROS_EC_DEV
new file mode 100644
index 000000000..a4fd1512e
--- /dev/null
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_MFD_CROS_EC_DEV
@@ -0,0 +1 @@
+CONFIG_MFD_CROS_EC_DEV=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index b532fb05f..dfdb5fcd5 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3343,8 +3343,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_CHARDEV=m
-# CONFIG_MFD_CROS_EC_DEV is not set
-CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_DEV=m
+# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 75134b3c4..f9b3acfe0 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3324,8 +3324,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_CHARDEV=m
-# CONFIG_MFD_CROS_EC_DEV is not set
-CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_DEV=m
+# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index b7beef6d4..cc3869e0a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3395,8 +3395,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_CHARDEV=m
-# CONFIG_MFD_CROS_EC_DEV is not set
-CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_DEV=m
+# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
CONFIG_MFD_DA9052_I2C=y
CONFIG_MFD_DA9052_SPI=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 3c23093d1..7cff58982 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3291,8 +3291,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_CHARDEV=m
-# CONFIG_MFD_CROS_EC_DEV is not set
-CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_DEV=m
+# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 0c82adbcc..73a6b815e 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3273,8 +3273,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_CHARDEV=m
-# CONFIG_MFD_CROS_EC_DEV is not set
-CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_DEV=m
+# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 81fe4b9f5..8bb6986ea 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3377,8 +3377,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_CHARDEV=m
-# CONFIG_MFD_CROS_EC_DEV is not set
-CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_DEV=m
+# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
CONFIG_MFD_DA9052_I2C=y
CONFIG_MFD_DA9052_SPI=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index e469c1d32..604f08ccd 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -887,14 +887,10 @@ CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_CHARDEV is not set
CONFIG_CROS_EC_DEBUGFS=m
-CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_ISHTP=m
+# CONFIG_CROS_EC is not set
# CONFIG_CROS_EC_LIGHTBAR is not set
-# CONFIG_CROS_EC_LPC is not set
-CONFIG_CROS_EC=m
-CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
-CONFIG_CROS_EC_SPI=m
CONFIG_CROS_KBD_LED_BACKLIGHT=m
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CROS_USBPD_LOGGER=m
@@ -1541,7 +1537,6 @@ CONFIG_EXTCON_INTEL_INT3496=m
# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
# CONFIG_EXTCON_RT8973A is not set
# CONFIG_EXTCON_SM5502 is not set
-# CONFIG_EXTCON_USBC_CROS_EC is not set
# CONFIG_EXTCON_USB_GPIO is not set
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
@@ -2061,7 +2056,6 @@ CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_COMPAT=y
-# CONFIG_I2C_CROS_EC_TUNNEL is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CORE is not set
@@ -2169,7 +2163,6 @@ CONFIG_IIO_BUFFER=y
CONFIG_IIO_CONFIGFS=m
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
-# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
@@ -2696,7 +2689,6 @@ CONFIG_KEXEC=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_BCM is not set
# CONFIG_KEYBOARD_CAP11XX is not set
-# CONFIG_KEYBOARD_CROS_EC is not set
# CONFIG_KEYBOARD_DLINK_DIR685 is not set
CONFIG_KEYBOARD_GPIO=m
CONFIG_KEYBOARD_GPIO_POLLED=m
@@ -3081,7 +3073,6 @@ CONFIG_MFD_AT91_USART=m
CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_CROS_EC_DEV is not set
# CONFIG_MFD_CROS_EC is not set
CONFIG_MFD_CS5535=y
# CONFIG_MFD_DA9052_I2C is not set
@@ -4356,7 +4347,6 @@ CONFIG_PTP_1588_CLOCK=y
CONFIG_PVH=y
CONFIG_PVPANIC=m
CONFIG_PWM_CRC=y
-# CONFIG_PWM_CROS_EC is not set
# CONFIG_PWM_FSL_FTM is not set
CONFIG_PWM_HIBVT=m
CONFIG_PWM_LPSS=m
@@ -4598,7 +4588,6 @@ CONFIG_RTC_DRV_BQ32K=m
CONFIG_RTC_DRV_BQ4802=m
# CONFIG_RTC_DRV_CADENCE is not set
CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_CROS_EC is not set
CONFIG_RTC_DRV_DS1286=m
# CONFIG_RTC_DRV_DS1302 is not set
CONFIG_RTC_DRV_DS1305=m
@@ -5346,7 +5335,6 @@ CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
CONFIG_SND_SOC_BD28623=m
# CONFIG_SND_SOC_BT_SCO is not set
-# CONFIG_SND_SOC_CROS_EC_CODEC is not set
# CONFIG_SND_SOC_CS35L32 is not set
# CONFIG_SND_SOC_CS35L33 is not set
CONFIG_SND_SOC_CS35L34=m
@@ -6420,7 +6408,7 @@ CONFIG_VIDEO_BT848=m
# CONFIG_VIDEO_CADENCE is not set
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CROS_EC_CEC=m
+# CONFIG_VIDEO_CROS_EC_CEC is not set
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX231XX_ALSA=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 1d5e6f962..8b18cf5c9 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -886,14 +886,10 @@ CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_CHARDEV is not set
# CONFIG_CROS_EC_DEBUGFS is not set
-CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_ISHTP=m
+# CONFIG_CROS_EC is not set
# CONFIG_CROS_EC_LIGHTBAR is not set
-# CONFIG_CROS_EC_LPC is not set
-CONFIG_CROS_EC=m
-CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
-CONFIG_CROS_EC_SPI=m
CONFIG_CROS_KBD_LED_BACKLIGHT=m
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CROS_USBPD_LOGGER=m
@@ -1532,7 +1528,6 @@ CONFIG_EXTCON_INTEL_INT3496=m
# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
# CONFIG_EXTCON_RT8973A is not set
# CONFIG_EXTCON_SM5502 is not set
-# CONFIG_EXTCON_USBC_CROS_EC is not set
# CONFIG_EXTCON_USB_GPIO is not set
CONFIG_EXTCON=y
CONFIG_EXTRA_FIRMWARE=""
@@ -2044,7 +2039,6 @@ CONFIG_I2C_AMD_MP2=m
# CONFIG_I2C_CBUS_GPIO is not set
CONFIG_I2C_CHARDEV=m
CONFIG_I2C_COMPAT=y
-# CONFIG_I2C_CROS_EC_TUNNEL is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
# CONFIG_I2C_DEBUG_CORE is not set
@@ -2152,7 +2146,6 @@ CONFIG_IIO_BUFFER=y
CONFIG_IIO_CONFIGFS=m
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
-# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
# CONFIG_IIO_HRTIMER_TRIGGER is not set
CONFIG_IIO_INTERRUPT_TRIGGER=m
@@ -2677,7 +2670,6 @@ CONFIG_KEXEC=y
CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_BCM is not set
# CONFIG_KEYBOARD_CAP11XX is not set
-# CONFIG_KEYBOARD_CROS_EC is not set
# CONFIG_KEYBOARD_DLINK_DIR685 is not set
CONFIG_KEYBOARD_GPIO=m
CONFIG_KEYBOARD_GPIO_POLLED=m
@@ -3062,7 +3054,6 @@ CONFIG_MFD_AT91_USART=m
CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_CROS_EC_DEV is not set
# CONFIG_MFD_CROS_EC is not set
CONFIG_MFD_CS5535=y
# CONFIG_MFD_DA9052_I2C is not set
@@ -4336,7 +4327,6 @@ CONFIG_PTP_1588_CLOCK=y
CONFIG_PVH=y
CONFIG_PVPANIC=m
CONFIG_PWM_CRC=y
-# CONFIG_PWM_CROS_EC is not set
# CONFIG_PWM_FSL_FTM is not set
CONFIG_PWM_HIBVT=m
CONFIG_PWM_LPSS=m
@@ -4578,7 +4568,6 @@ CONFIG_RTC_DRV_BQ32K=m
CONFIG_RTC_DRV_BQ4802=m
# CONFIG_RTC_DRV_CADENCE is not set
CONFIG_RTC_DRV_CMOS=y
-# CONFIG_RTC_DRV_CROS_EC is not set
CONFIG_RTC_DRV_DS1286=m
# CONFIG_RTC_DRV_DS1302 is not set
CONFIG_RTC_DRV_DS1305=m
@@ -5325,7 +5314,6 @@ CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
CONFIG_SND_SOC_BD28623=m
# CONFIG_SND_SOC_BT_SCO is not set
-# CONFIG_SND_SOC_CROS_EC_CODEC is not set
# CONFIG_SND_SOC_CS35L32 is not set
# CONFIG_SND_SOC_CS35L33 is not set
CONFIG_SND_SOC_CS35L34=m
@@ -6399,7 +6387,7 @@ CONFIG_VIDEO_BT848=m
# CONFIG_VIDEO_CADENCE is not set
CONFIG_VIDEO_CAFE_CCIC=m
CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CROS_EC_CEC=m
+# CONFIG_VIDEO_CROS_EC_CEC is not set
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX231XX_ALSA=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 39aac6973..4161f5d17 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2823,7 +2823,6 @@ CONFIG_MFD_AT91_USART=m
CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_CROS_EC_DEV is not set
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 29a25c20e..502e2d3ec 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2803,7 +2803,6 @@ CONFIG_MFD_AT91_USART=m
CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_CROS_EC_DEV is not set
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 83b12ee0d..e8f5a313a 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2800,7 +2800,6 @@ CONFIG_MFD_AT91_USART=m
# CONFIG_MFD_BD9571MWV is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_CROS_EC_DEV is not set
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 69ee97c19..31a55bab9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2780,7 +2780,6 @@ CONFIG_MFD_AT91_USART=m
# CONFIG_MFD_BD9571MWV is not set
CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
-# CONFIG_MFD_CROS_EC_DEV is not set
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 2f4a72cf7..fd54633d9 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -901,14 +901,11 @@ CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_CHARDEV is not set
CONFIG_CROS_EC_DEBUGFS=m
-CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_ISHTP=m
+# CONFIG_CROS_EC is not set
CONFIG_CROS_EC_LIGHTBAR=m
CONFIG_CROS_EC_LPC=m
-CONFIG_CROS_EC=m
-CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
-CONFIG_CROS_EC_SPI=m
CONFIG_CROS_EC_SYSFS=m
CONFIG_CROS_KBD_LED_BACKLIGHT=m
CONFIG_CROSS_MEMORY_ATTACH=y
@@ -3128,8 +3125,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_CHARDEV=m
-# CONFIG_MFD_CROS_EC_DEV is not set
-CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_DEV=m
+# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -6472,7 +6469,7 @@ CONFIG_VIDEO_BT848=m
# CONFIG_VIDEO_CADENCE is not set
# CONFIG_VIDEO_CAFE_CCIC is not set
CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CROS_EC_CEC=m
+# CONFIG_VIDEO_CROS_EC_CEC is not set
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX231XX_ALSA=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index b13dce46f..6e69df2e1 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -900,14 +900,11 @@ CONFIG_CRC_PMIC_OPREGION=y
CONFIG_CRC_T10DIF=y
# CONFIG_CROS_EC_CHARDEV is not set
# CONFIG_CROS_EC_DEBUGFS is not set
-CONFIG_CROS_EC_I2C=m
CONFIG_CROS_EC_ISHTP=m
+# CONFIG_CROS_EC is not set
CONFIG_CROS_EC_LIGHTBAR=m
CONFIG_CROS_EC_LPC=m
-CONFIG_CROS_EC=m
-CONFIG_CROS_EC_PROTO=y
CONFIG_CROS_EC_RPMSG=m
-CONFIG_CROS_EC_SPI=m
CONFIG_CROS_EC_SYSFS=m
CONFIG_CROS_KBD_LED_BACKLIGHT=m
CONFIG_CROSS_MEMORY_ATTACH=y
@@ -3109,8 +3106,8 @@ CONFIG_MFD_BD9571MWV=m
CONFIG_MFD_CORE=y
# CONFIG_MFD_CPCAP is not set
CONFIG_MFD_CROS_EC_CHARDEV=m
-# CONFIG_MFD_CROS_EC_DEV is not set
-CONFIG_MFD_CROS_EC=m
+CONFIG_MFD_CROS_EC_DEV=m
+# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
# CONFIG_MFD_DA9052_I2C is not set
# CONFIG_MFD_DA9052_SPI is not set
@@ -6451,7 +6448,7 @@ CONFIG_VIDEO_BT848=m
# CONFIG_VIDEO_CADENCE is not set
# CONFIG_VIDEO_CAFE_CCIC is not set
CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_CROS_EC_CEC=m
+# CONFIG_VIDEO_CROS_EC_CEC is not set
CONFIG_VIDEO_CX18_ALSA=m
CONFIG_VIDEO_CX18=m
CONFIG_VIDEO_CX231XX_ALSA=m