Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e011558 authored by Thierry Escande's avatar Thierry Escande Committed by Lee Jones
Browse files

cros_ec: Move cros_ec_dev module to drivers/mfd 



The cros_ec_dev module is responsible for registering the MFD devices
attached to the ChromeOS EC. This patch moves this module to drivers/mfd
so calls to mfd_add_devices() are not done from outside the MFD subtree
anymore.

Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Reviewed-by: default avatarGwendal Grignou <gwendal@chromium.org>
Tested-by: default avatarGuenter Roeck <groeck@chromium.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent ea01a31b

drivers/mfd/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -222,6 +222,16 @@ config MFD_CROS_EC_SPI 
	  response time cannot be guaranteed, we support ignoring

	  'pre-amble' bytes before the response actually starts.



config MFD_CROS_EC_CHARDEV

        tristate "Chrome OS Embedded Controller userspace device interface"

        depends on MFD_CROS_EC

        select CROS_EC_CTL

        ---help---

          This driver adds support to talk with the ChromeOS EC from userspace.



          If you have a supported Chromebook, choose Y or M here.

          The module will be called cros_ec_dev.



config MFD_ASIC3

	bool "Compaq ASIC3"

	depends on GPIOLIB && ARM

drivers/mfd/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ cros_ec_core-$(CONFIG_ACPI) += cros_ec_acpi_gpe.o 
obj-$(CONFIG_MFD_CROS_EC)	+= cros_ec_core.o

obj-$(CONFIG_MFD_CROS_EC_I2C)	+= cros_ec_i2c.o

obj-$(CONFIG_MFD_CROS_EC_SPI)	+= cros_ec_spi.o

obj-$(CONFIG_MFD_CROS_EC_CHARDEV) += cros_ec_dev.o

obj-$(CONFIG_MFD_EXYNOS_LPASS)	+= exynos-lpass.o



rtsx_pci-objs			:= rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o

drivers/platform/chrome/cros_ec_dev.c→drivers/mfd/cros_ec_dev.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/slab.h>

#include <linux/uaccess.h>



#include "cros_ec_debugfs.h"

#include "cros_ec_dev.h"



#define DRV_NAME "cros-ec-dev"

drivers/platform/chrome/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -38,16 +38,6 @@ config CHROMEOS_PSTORE 
	  If you have a supported Chromebook, choose Y or M here.

	  The module will be called chromeos_pstore.



config CROS_EC_CHARDEV

        tristate "Chrome OS Embedded Controller userspace device interface"

        depends on MFD_CROS_EC

        select CROS_EC_CTL

        ---help---

          This driver adds support to talk with the ChromeOS EC from userspace.



          If you have a supported Chromebook, choose Y or M here.

          The module will be called cros_ec_dev.



config CROS_EC_CTL

        tristate