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

Commit abeed71b authored by Wei-Ning Huang's avatar Wei-Ning Huang Committed by Lee Jones
Browse files

mfd: cros_ec_i2c: Add ACPI module device table 



Add ACPI module device table for matching cros-ec devices to load the
cros_ec_i2c driver automatically.

Signed-off-by: default avatarWei-Ning Huang <wnhuang@google.com>
Acked-by: default avatarBenson Leung <bleung@chromium.org>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: default avatarGwendal Grignou <gwendal@chromium.org>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent e15b7f44

drivers/mfd/cros_ec_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static void ec_device_shutdown(struct platform_device *pdev) 


static const struct platform_device_id cros_ec_id[] = {

	{ DRV_NAME, 0 },

	{ /* sentinel */ },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(platform, cros_ec_id);

drivers/mfd/cros_ec_i2c.c

+12 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
 * GNU General Public License for more details.

 */



#include <linux/acpi.h>

#include <linux/delay.h>

#include <linux/kernel.h>

#include <linux/module.h>
@@ -344,11 +345,13 @@ static int cros_ec_i2c_resume(struct device *dev) 
static SIMPLE_DEV_PM_OPS(cros_ec_i2c_pm_ops, cros_ec_i2c_suspend,

			  cros_ec_i2c_resume);



#ifdef CONFIG_OF

static const struct of_device_id cros_ec_i2c_of_match[] = {

	{ .compatible = "google,cros-ec-i2c", },

	{ /* sentinel */ },

};

MODULE_DEVICE_TABLE(of, cros_ec_i2c_of_match);

#endif



static const struct i2c_device_id cros_ec_i2c_id[] = {

	{ "cros-ec-i2c", 0 },
@@ -356,9 +359,18 @@ static const struct i2c_device_id cros_ec_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, cros_ec_i2c_id);



#ifdef CONFIG_ACPI

static const struct acpi_device_id cros_ec_i2c_acpi_id[] = {

	{ "GOOG0008", 0 },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(acpi, cros_ec_i2c_acpi_id);

#endif



static struct i2c_driver cros_ec_driver = {

	.driver	= {

		.name	= "cros-ec-i2c",

		.acpi_match_table = ACPI_PTR(cros_ec_i2c_acpi_id),

		.of_match_table = of_match_ptr(cros_ec_i2c_of_match),

		.pm	= &cros_ec_i2c_pm_ops,

	},