mfd / platform: cros_ec: Rename config to a better name

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

The cros-ec-dev is a multifunction device that now doesn't implement any
chardev communication interface. MFD_CROS_EC_CHARDEV doesn't look
a good name to describe that device and can cause confusion. Hence
rename it to CROS_EC_DEV.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Tested-by: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Enric Balletbo i Serra and committed by

Lee Jones 6 years ago 2fa2b980 459aedb9

+32 -19

3 changed files

expand all

drivers

mfd

Kconfig

Makefile

platform

chrome

Kconfig

+10 -7

drivers/mfd/Kconfig

··· 211 211 components like regulators or the PEK (Power Enable Key) under the 212 212 corresponding menus. 213 213 214 - config MFD_CROS_EC_CHARDEV 215 - tristate "Chrome OS Embedded Controller userspace device interface" 216 - depends on CROS_EC 214 + config MFD_CROS_EC_DEV 215 + tristate "ChromeOS Embedded Controller multifunction device" 217 216 select MFD_CORE 218 - ---help--- 219 - This driver adds support to talk with the ChromeOS EC from userspace. 217 + depends on CROS_EC 218 + default CROS_EC 219 + help 220 + Select this to get support for ChromeOS Embedded Controller 221 + sub-devices. This driver will instantiate additional drivers such 222 + as RTC, USBPD, etc. but you have to select the individual drivers. 220 223 221 - If you have a supported Chromebook, choose Y or M here. 222 - The module will be called cros_ec_dev. 224 + To compile this driver as a module, choose M here: the module will be 225 + called cros-ec-dev. 223 226 224 227 config MFD_MADERA 225 228 tristate "Cirrus Logic Madera codecs"

+1 -1

drivers/mfd/Makefile

··· 13 13 obj-$(CONFIG_ARCH_BCM2835) += bcm2835-pm.o 14 14 obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o 15 15 obj-$(CONFIG_MFD_BD9571MWV) += bd9571mwv.o 16 - obj-$(CONFIG_MFD_CROS_EC_CHARDEV) += cros_ec_dev.o 16 + obj-$(CONFIG_MFD_CROS_EC_DEV) += cros_ec_dev.o 17 17 obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o 18 18 19 19 obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o

+21 -11

drivers/platform/chrome/Kconfig

··· 3 3 # Platform support for Chrome OS hardware (Chromebooks and Chromeboxes) 4 4 # 5 5 6 + config MFD_CROS_EC 7 + tristate "Platform support for Chrome hardware (transitional)" 8 + select CHROME_PLATFORMS 9 + select CROS_EC 10 + select CONFIG_MFD_CROS_EC_DEV 11 + depends on X86 || ARM || ARM64 || COMPILE_TEST 12 + help 13 + This is a transitional Kconfig option and will be removed after 14 + everyone enables the parts individually. 15 + 6 16 menuconfig CHROME_PLATFORMS 7 17 bool "Platform support for Chrome hardware" 8 18 depends on X86 || ARM || ARM64 || COMPILE_TEST ··· 97 87 98 88 config CROS_EC_ISHTP 99 89 tristate "ChromeOS Embedded Controller (ISHTP)" 100 - depends on MFD_CROS_EC 90 + depends on CROS_EC 101 91 depends on INTEL_ISH_HID 102 92 help 103 93 If you say Y here, you get support for talking to the ChromeOS EC ··· 148 138 149 139 config CROS_EC_CHARDEV 150 140 tristate "ChromeOS EC miscdevice" 151 - depends on MFD_CROS_EC_CHARDEV 152 - default MFD_CROS_EC_CHARDEV 141 + depends on MFD_CROS_EC_DEV 142 + default MFD_CROS_EC_DEV 153 143 help 154 144 This driver adds file operations support to talk with the 155 145 ChromeOS EC from userspace via a character device. ··· 159 149 160 150 config CROS_EC_LIGHTBAR 161 151 tristate "Chromebook Pixel's lightbar support" 162 - depends on MFD_CROS_EC_CHARDEV 163 - default MFD_CROS_EC_CHARDEV 152 + depends on MFD_CROS_EC_DEV 153 + default MFD_CROS_EC_DEV 164 154 help 165 155 This option exposes the Chromebook Pixel's lightbar to 166 156 userspace. ··· 170 160 171 161 config CROS_EC_VBC 172 162 tristate "ChromeOS EC vboot context support" 173 - depends on MFD_CROS_EC_CHARDEV && OF 174 - default MFD_CROS_EC_CHARDEV 163 + depends on MFD_CROS_EC_DEV && OF 164 + default MFD_CROS_EC_DEV 175 165 help 176 166 This option exposes the ChromeOS EC vboot context nvram to 177 167 userspace. ··· 181 171 182 172 config CROS_EC_DEBUGFS 183 173 tristate "Export ChromeOS EC internals in DebugFS" 184 - depends on MFD_CROS_EC_CHARDEV && DEBUG_FS 185 - default MFD_CROS_EC_CHARDEV 174 + depends on MFD_CROS_EC_DEV && DEBUG_FS 175 + default MFD_CROS_EC_DEV 186 176 help 187 177 This option exposes the ChromeOS EC device internals to 188 178 userspace. ··· 192 182 193 183 config CROS_EC_SYSFS 194 184 tristate "ChromeOS EC control and information through sysfs" 195 - depends on MFD_CROS_EC_CHARDEV && SYSFS 196 - default MFD_CROS_EC_CHARDEV 185 + depends on MFD_CROS_EC_DEV && SYSFS 186 + default MFD_CROS_EC_DEV 197 187 help 198 188 This option exposes some sysfs attributes to control and get 199 189 information from ChromeOS EC.