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

Unverified Commit 4398ef0e authored by Benson Leung's avatar Benson Leung
Browse files

Merge branch 'ibs-for-chrome-platform-merged' into working-branch-for-4.16 



Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
parents 50c4c4e2 5e011558

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/mfd/cros_ec.c

+2 −2
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ static struct cros_ec_platform pd_p = { 
};



static const struct mfd_cell ec_cell = {

	.name = "cros-ec-ctl",

	.name = "cros-ec-dev",

	.platform_data = &ec_p,

	.pdata_size = sizeof(ec_p),

};



static const struct mfd_cell ec_pd_cell = {

	.name = "cros-ec-ctl",

	.name = "cros-ec-dev",

	.platform_data = &pd_p,

	.pdata_size = sizeof(pd_p),

};

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

+5 −3
Original line number Diff line number Diff line
@@ -25,9 +25,10 @@ 
#include <linux/slab.h>

#include <linux/uaccess.h>



#include "cros_ec_debugfs.h"

#include "cros_ec_dev.h"



#define DRV_NAME "cros-ec-dev"



/* Device variables */

#define CROS_MAX_DEV 128

static int ec_major;
@@ -461,7 +462,7 @@ static int ec_device_remove(struct platform_device *pdev) 
}



static const struct platform_device_id cros_ec_id[] = {

	{ "cros-ec-ctl", 0 },

	{ DRV_NAME, 0 },

	{ /* sentinel */ },

};

MODULE_DEVICE_TABLE(platform, cros_ec_id);
@@ -493,7 +494,7 @@ static const struct dev_pm_ops cros_ec_dev_pm_ops = { 


static struct platform_driver cros_ec_dev_driver = {

	.driver = {

		.name = "cros-ec-ctl",

		.name = DRV_NAME,

		.pm = &cros_ec_dev_pm_ops,

	},

	.probe = ec_device_probe,
@@ -544,6 +545,7 @@ static void __exit cros_ec_dev_exit(void) 
module_init(cros_ec_dev_init);

module_exit(cros_ec_dev_exit);



MODULE_ALIAS("platform:" DRV_NAME);

MODULE_AUTHOR("Bill Richardson <wfrichar@chromium.org>");

MODULE_DESCRIPTION("Userspace interface to the Chrome OS Embedded Controller");

MODULE_VERSION("1.0");