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>

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index d79882b..c5c5ff3 100644 (file)
--- 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 59ab5bf..0c0a848 100644 (file)
--- 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

diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig
index bd3524b..ee5f08e 100644 (file)
--- a/drivers/platform/chrome/Kconfig
+++ b/drivers/platform/chrome/Kconfig
@@ -3,6 +3,16 @@
 # Platform support for Chrome OS hardware (Chromebooks and Chromeboxes)
 #
 
+config MFD_CROS_EC
+       tristate "Platform support for Chrome hardware (transitional)"
+       select CHROME_PLATFORMS
+       select CROS_EC
+       select CONFIG_MFD_CROS_EC_DEV
+       depends on X86 || ARM || ARM64 || COMPILE_TEST
+       help
+         This is a transitional Kconfig option and will be removed after
+         everyone enables the parts individually.
+
 menuconfig CHROME_PLATFORMS
        bool "Platform support for Chrome hardware"
        depends on X86 || ARM || ARM64 || COMPILE_TEST
@@ -87,7 +97,7 @@ config CROS_EC_RPMSG
 
 config CROS_EC_ISHTP
        tristate "ChromeOS Embedded Controller (ISHTP)"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        depends on INTEL_ISH_HID
        help
          If you say Y here, you get support for talking to the ChromeOS EC
@@ -138,8 +148,8 @@ config CROS_KBD_LED_BACKLIGHT
 
 config CROS_EC_CHARDEV
        tristate "ChromeOS EC miscdevice"
-       depends on MFD_CROS_EC_CHARDEV
-       default MFD_CROS_EC_CHARDEV
+       depends on MFD_CROS_EC_DEV
+       default MFD_CROS_EC_DEV
        help
          This driver adds file operations support to talk with the
          ChromeOS EC from userspace via a character device.
@@ -149,8 +159,8 @@ config CROS_EC_CHARDEV
 
 config CROS_EC_LIGHTBAR
        tristate "Chromebook Pixel's lightbar support"
-       depends on MFD_CROS_EC_CHARDEV
-       default MFD_CROS_EC_CHARDEV
+       depends on MFD_CROS_EC_DEV
+       default MFD_CROS_EC_DEV
        help
          This option exposes the Chromebook Pixel's lightbar to
          userspace.
@@ -160,8 +170,8 @@ config CROS_EC_LIGHTBAR
 
 config CROS_EC_VBC
        tristate "ChromeOS EC vboot context support"
-       depends on MFD_CROS_EC_CHARDEV && OF
-       default MFD_CROS_EC_CHARDEV
+       depends on MFD_CROS_EC_DEV && OF
+       default MFD_CROS_EC_DEV
        help
          This option exposes the ChromeOS EC vboot context nvram to
          userspace.
@@ -171,8 +181,8 @@ config CROS_EC_VBC
 
 config CROS_EC_DEBUGFS
        tristate "Export ChromeOS EC internals in DebugFS"
-       depends on MFD_CROS_EC_CHARDEV && DEBUG_FS
-       default MFD_CROS_EC_CHARDEV
+       depends on MFD_CROS_EC_DEV && DEBUG_FS
+       default MFD_CROS_EC_DEV
        help
          This option exposes the ChromeOS EC device internals to
          userspace.
@@ -182,8 +192,8 @@ config CROS_EC_DEBUGFS
 
 config CROS_EC_SYSFS
        tristate "ChromeOS EC control and information through sysfs"
-       depends on MFD_CROS_EC_CHARDEV && SYSFS
-       default MFD_CROS_EC_CHARDEV
+       depends on MFD_CROS_EC_DEV && SYSFS
+       default MFD_CROS_EC_DEV
        help
          This option exposes some sysfs attributes to control and get
          information from ChromeOS EC.