mfd / platform: cros_ec: Move cros-ec core driver out from MFD

Now, the ChromeOS EC core driver has nothing related to an MFD device, so
move that driver from the MFD subsystem to the platform/chrome subsystem.

Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Thierry Reding <thierry.reding@gmail.com>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.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/extcon/Kconfig b/drivers/extcon/Kconfig
index fa1804460e8cb171d9f44793eeee76a2eb3315d3..aac507bff135c06dfd6bce81752b7f717aa601ba 100644 (file)
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -181,7 +181,7 @@ config EXTCON_USB_GPIO
 
 config EXTCON_USBC_CROS_EC
        tristate "ChromeOS Embedded Controller EXTCON support"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        help
          Say Y here to enable USB Type C cable detection extcon support when
          using Chrome OS EC based USB Type-C ports.

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3872e03d9a59f8db7ad57bd980f36a2f6c7b57d6..a958b9625bbaf2900b3fd5caa362f5b4138d85bb 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -376,7 +376,7 @@ config HOLTEK_FF
 
 config HID_GOOGLE_HAMMER
        tristate "Google Hammer Keyboard"
-       depends on USB_HID && LEDS_CLASS && MFD_CROS_EC
+       depends on USB_HID && LEDS_CLASS && CROS_EC
        ---help---
        Say Y here if you have a Google Hammer device.
 

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 09367fc014c3f867b9f40c5c3457b07b411bb7b7..938fe1f2ce3110ad0e1b073a644f3383fcb67ed1 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -1345,7 +1345,7 @@ config I2C_SIBYTE
 
 config I2C_CROS_EC_TUNNEL
        tristate "ChromeOS EC tunnel I2C bus"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        help
          If you say yes here you get an I2C bus that will tunnel i2c commands
          through to the other side of the ChromeOS EC to the i2c bus

diff --git a/drivers/iio/common/cros_ec_sensors/Kconfig b/drivers/iio/common/cros_ec_sensors/Kconfig
index bcb58fb76b9f7309375d8530878c73df98ebf4a3..cdbb29cfb9076b738071bbb3a3dfc696e1a8ebaa 100644 (file)
--- a/drivers/iio/common/cros_ec_sensors/Kconfig
+++ b/drivers/iio/common/cros_ec_sensors/Kconfig
@@ -4,7 +4,7 @@
 #
 config IIO_CROS_EC_SENSORS_CORE
        tristate "ChromeOS EC Sensors Core"
-       depends on SYSFS && MFD_CROS_EC
+       depends on SYSFS && CROS_EC
        select IIO_BUFFER
        select IIO_TRIGGERED_BUFFER
        help

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 8e9c3ea9d5e799c2873d165db109a850cff7e868..861c7a2105a25e165a3094f0f96e1a328320c6e7 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -745,7 +745,7 @@ config KEYBOARD_W90P910
 config KEYBOARD_CROS_EC
        tristate "ChromeOS EC keyboard"
        select INPUT_MATRIXKMAP
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        help
          Say Y here to enable the matrix keyboard used by ChromeOS devices
          and implemented on the ChromeOS EC. You must enable one bus option

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 8a19654b393a92033fc746e06e4ef99687656551..98c3a9a6725e9a70443acda71a54c1d076ca2be8 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -547,10 +547,9 @@ if CEC_PLATFORM_DRIVERS
 
 config VIDEO_CROS_EC_CEC
        tristate "ChromeOS EC CEC driver"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        select CEC_CORE
        select CEC_NOTIFIER
-       select CHROME_PLATFORMS
        select CROS_EC_PROTO
        help
          If you say yes here you will get support for the

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index f129f9678940599329a1673ac29a082ce48ab1f4..d79882b608cffef420a9f9172023c4b0e1db69cd 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -211,21 +211,10 @@ config MFD_AXP20X_RSB
          components like regulators or the PEK (Power Enable Key) under the
          corresponding menus.
 
-config MFD_CROS_EC
-       tristate "ChromeOS Embedded Controller"
-       select MFD_CORE
-       select CHROME_PLATFORMS
-       select CROS_EC_PROTO
-       depends on X86 || ARM || ARM64 || COMPILE_TEST
-       help
-         If you say Y here you get support for the ChromeOS Embedded
-         Controller (EC) providing keyboard, battery and power services.
-         You also need to enable the driver for the bus you are using. The
-         protocol for talking to the EC is defined by the bus driver.
-
 config MFD_CROS_EC_CHARDEV
        tristate "Chrome OS Embedded Controller userspace device interface"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
+       select MFD_CORE
        ---help---
          This driver adds support to talk with the ChromeOS EC from userspace.
 

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index f026ada68f6a29d4d7bcd641dd6e7e06b0d7864d..59ab5bf51b652d2ca40810f154df1439b5279479 100644 (file)
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -13,8 +13,6 @@ 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
-cros_ec_core-objs              := cros_ec.o
-obj-$(CONFIG_MFD_CROS_EC)      += cros_ec_core.o
 obj-$(CONFIG_MFD_CROS_EC_CHARDEV) += cros_ec_dev.o
 obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o
 

diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig
index 970679d0b6f66c4d6040cf1df60c9549dc805083..eaeb04e07335c9642ff1c0e8dd1e517cace730e5 100644 (file)
--- a/drivers/platform/chrome/Kconfig
+++ b/drivers/platform/chrome/Kconfig
@@ -50,9 +50,22 @@ config CHROMEOS_TBMC
          To compile this driver as a module, choose M here: the
          module will be called chromeos_tbmc.
 
+config CROS_EC
+       tristate "ChromeOS Embedded Controller"
+       select CROS_EC_PROTO
+       depends on X86 || ARM || ARM64 || COMPILE_TEST
+       help
+         If you say Y here you get support for the ChromeOS Embedded
+         Controller (EC) providing keyboard, battery and power services.
+         You also need to enable the driver for the bus you are using. The
+         protocol for talking to the EC is defined by the bus driver.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cros_ec.
+
 config CROS_EC_I2C
        tristate "ChromeOS Embedded Controller (I2C)"
-       depends on MFD_CROS_EC && I2C
+       depends on CROS_EC && I2C
 
        help
          If you say Y here, you get support for talking to the ChromeOS
@@ -62,7 +75,7 @@ config CROS_EC_I2C
 
 config CROS_EC_RPMSG
        tristate "ChromeOS Embedded Controller (rpmsg)"
-       depends on MFD_CROS_EC && RPMSG && OF
+       depends on CROS_EC && RPMSG && OF
        help
          If you say Y here, you get support for talking to the ChromeOS EC
          through rpmsg. This uses a simple byte-level protocol with a
@@ -87,7 +100,7 @@ config CROS_EC_ISHTP
 
 config CROS_EC_SPI
        tristate "ChromeOS Embedded Controller (SPI)"
-       depends on MFD_CROS_EC && SPI
+       depends on CROS_EC && SPI
 
        ---help---
          If you say Y here, you get support for talking to the ChromeOS EC
@@ -97,7 +110,7 @@ config CROS_EC_SPI
 
 config CROS_EC_LPC
        tristate "ChromeOS Embedded Controller (LPC)"
-       depends on MFD_CROS_EC && ACPI && (X86 || COMPILE_TEST)
+       depends on CROS_EC && ACPI && (X86 || COMPILE_TEST)
        help
          If you say Y here, you get support for talking to the ChromeOS EC
          over an LPC bus, including the LPC Microchip EC (MEC) variant.

diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile
index fd0af05cc14c8941100373f85df9103f4a8dd6f4..12ff8de5ac7a9e0936bd8e1f2d0542c681902c9b 100644 (file)
--- a/drivers/platform/chrome/Makefile
+++ b/drivers/platform/chrome/Makefile
@@ -6,6 +6,7 @@ CFLAGS_cros_ec_trace.o:=                -I$(src)
 obj-$(CONFIG_CHROMEOS_LAPTOP)          += chromeos_laptop.o
 obj-$(CONFIG_CHROMEOS_PSTORE)          += chromeos_pstore.o
 obj-$(CONFIG_CHROMEOS_TBMC)            += chromeos_tbmc.o
+obj-$(CONFIG_CROS_EC)                  += cros_ec.o
 obj-$(CONFIG_CROS_EC_I2C)              += cros_ec_i2c.o
 obj-$(CONFIG_CROS_EC_ISHTP)            += cros_ec_ishtp.o
 obj-$(CONFIG_CROS_EC_RPMSG)            += cros_ec_rpmsg.o

diff --git a/drivers/mfd/cros_ec.c b/drivers/platform/chrome/cros_ec.c
similarity index 100%
rename from drivers/mfd/cros_ec.c
rename to drivers/platform/chrome/cros_ec.c

diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index 5d91b5160b41458443c2a03ef6a4d57507f2f87a..5e448b64393d33592a6792c54ce92056fffc799a 100644 (file)
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -670,7 +670,7 @@ config CHARGER_RT9455
 
 config CHARGER_CROS_USBPD
        tristate "ChromeOS EC based USBPD charger"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        default n
        help
          Say Y here to enable ChromeOS EC based USBPD charger

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index a7e57516959e066dbdf5dd19c0f5ec10ae93dcdc..b0e632ba85908d47ac661741e4fa61d8e31c1dc0 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -145,7 +145,7 @@ config PWM_CRC
 
 config PWM_CROS_EC
        tristate "ChromeOS EC PWM driver"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        help
          PWM driver for exposing a PWM attached to the ChromeOS Embedded
          Controller.

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index e72f65b61176d12e2bc296de9f25eda572db88f3..a45175fd8cc4f0d63c77c6a484acc31c08f2e9ac 100644 (file)
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1274,7 +1274,7 @@ config RTC_DRV_ZYNQMP
 
 config RTC_DRV_CROS_EC
        tristate "Chrome OS EC RTC driver"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        help
          If you say yes here you will get support for the
          Chrome OS Embedded Controller's RTC.

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 9f89a5346299de210787a999e57c421c17b84f5b..11fd97cd9ab4237b8562c753d3080a1661c16e65 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -51,7 +51,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_BT_SCO
        select SND_SOC_BD28623
        select SND_SOC_CQ0093VC
-       select SND_SOC_CROS_EC_CODEC if MFD_CROS_EC
+       select SND_SOC_CROS_EC_CODEC if CROS_EC
        select SND_SOC_CS35L32 if I2C
        select SND_SOC_CS35L33 if I2C
        select SND_SOC_CS35L34 if I2C
@@ -474,7 +474,7 @@ config SND_SOC_CQ0093VC
 
 config SND_SOC_CROS_EC_CODEC
        tristate "codec driver for ChromeOS EC"
-       depends on MFD_CROS_EC
+       depends on CROS_EC
        help
          If you say yes here you will get support for the
          ChromeOS Embedded Controller's Audio Codec.

diff --git a/sound/soc/qcom/Kconfig b/sound/soc/qcom/Kconfig
index 8e3e86619b3521ecdfff18bb5c1a1988ed1e3efe..60086858e920baca09e3930ffcd2fd4b0705bfd1 100644 (file)
--- a/sound/soc/qcom/Kconfig
+++ b/sound/soc/qcom/Kconfig
@@ -99,7 +99,7 @@ config SND_SOC_MSM8996
 
 config SND_SOC_SDM845
        tristate "SoC Machine driver for SDM845 boards"
-       depends on QCOM_APR && MFD_CROS_EC && I2C
+       depends on QCOM_APR && CROS_EC && I2C
        select SND_SOC_QDSP6
        select SND_SOC_QCOM_COMMON
        select SND_SOC_RT5663