summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorEnric Balletbo i Serra <enric.balletbo@collabora.com>2019-09-02 11:53:04 +0200
committerLee Jones <lee.jones@linaro.org>2019-09-02 11:33:35 +0100
commit2fa2b980e3fe187a0b916bfe6bd5822889b44d5e (patch)
tree5513cc965b02425a885a9ad6b7b18672c4c1d4f1 /drivers/mfd
parent459aedb9a5d4b92e4aee343ee8ee5aeca8e1d93a (diff)
downloadlinux-2fa2b980e3fe187a0b916bfe6bd5822889b44d5e.tar.bz2
mfd / platform: cros_ec: Rename config to a better name
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>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/Kconfig17
-rw-r--r--drivers/mfd/Makefile2
2 files changed, 11 insertions, 8 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index d79882b608cf..c5c5ff308881 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -211,15 +211,18 @@ config MFD_AXP20X_RSB
components like regulators or the PEK (Power Enable Key) under the
corresponding menus.
-config MFD_CROS_EC_CHARDEV
- tristate "Chrome OS Embedded Controller userspace device interface"
- depends on CROS_EC
+config MFD_CROS_EC_DEV
+ tristate "ChromeOS Embedded Controller multifunction device"
select MFD_CORE
- ---help---
- This driver adds support to talk with the ChromeOS EC from userspace.
+ depends on CROS_EC
+ default CROS_EC
+ help
+ Select this to get support for ChromeOS Embedded Controller
+ sub-devices. This driver will instantiate additional drivers such
+ as RTC, USBPD, etc. but you have to select the individual drivers.
- If you have a supported Chromebook, choose Y or M here.
- The module will be called cros_ec_dev.
+ To compile this driver as a module, choose M here: the module will be
+ called cros-ec-dev.
config MFD_MADERA
tristate "Cirrus Logic Madera codecs"
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 59ab5bf51b65..0c0a848e62df 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -13,7 +13,7 @@ obj-$(CONFIG_MFD_ASIC3) += asic3.o tmio_core.o
obj-$(CONFIG_ARCH_BCM2835) += bcm2835-pm.o
obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o
obj-$(CONFIG_MFD_BD9571MWV) += bd9571mwv.o
-obj-$(CONFIG_MFD_CROS_EC_CHARDEV) += cros_ec_dev.o
+obj-$(CONFIG_MFD_CROS_EC_DEV) += cros_ec_dev.o
obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o
obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o