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

Commit 12278dc7 authored by Gwendal Grignou's avatar Gwendal Grignou Committed by Benson Leung
Browse files

platform/chrome: cros_ec_lpc: Add support for GOOG004 ACPI device 



This patch removes platform_device_register() call and adds an ACPI
device id structure. The driver is now automatically probed for devices
with a GOOG0004 ACPI entry.

Signed-off-by: default avatarGwendal Grignou <gwendal@chromium.org>
Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
parent 8d4a3dc4

drivers/platform/chrome/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ config CROS_EC_CHARDEV 


config CROS_EC_LPC

        tristate "ChromeOS Embedded Controller (LPC)"

        depends on MFD_CROS_EC && (X86 || COMPILE_TEST)

        depends on MFD_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. This uses a simple byte-level protocol with a

drivers/platform/chrome/cros_ec_lpc.c

+9 −14
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 * expensive.

 */



#include <linux/acpi.h>

#include <linux/dmi.h>

#include <linux/delay.h>

#include <linux/io.h>
@@ -32,6 +33,7 @@ 
#include <linux/printk.h>



#define DRV_NAME "cros_ec_lpcs"

#define ACPI_DRV_NAME "GOOG0004"



static int ec_response_timed_out(void)

{
@@ -288,6 +290,12 @@ static int cros_ec_lpc_remove(struct platform_device *pdev) 
	return 0;

}



static const struct acpi_device_id cros_ec_lpc_acpi_device_ids[] = {

	{ ACPI_DRV_NAME, 0 },

	{ }

};

MODULE_DEVICE_TABLE(acpi, cros_ec_lpc_acpi_device_ids);



static struct dmi_system_id cros_ec_lpc_dmi_table[] __initdata = {

	{

		/*
@@ -328,15 +336,12 @@ MODULE_DEVICE_TABLE(dmi, cros_ec_lpc_dmi_table); 
static struct platform_driver cros_ec_lpc_driver = {

	.driver = {

		.name = DRV_NAME,

		.acpi_match_table = cros_ec_lpc_acpi_device_ids,

	},

	.probe = cros_ec_lpc_probe,

	.remove = cros_ec_lpc_remove,

};



static struct platform_device cros_ec_lpc_device = {

	.name = DRV_NAME

};



static int __init cros_ec_lpc_init(void)

{

	int ret;
@@ -356,21 +361,11 @@ static int __init cros_ec_lpc_init(void) 
		return ret;

	}



	/* Register the device, and it'll get hooked up automatically */

	ret = platform_device_register(&cros_ec_lpc_device);

	if (ret) {

		pr_err(DRV_NAME ": can't register device: %d\n", ret);

		platform_driver_unregister(&cros_ec_lpc_driver);

		cros_ec_lpc_reg_destroy();

		return ret;

	}



	return 0;

}



static void __exit cros_ec_lpc_exit(void)

{

	platform_device_unregister(&cros_ec_lpc_device);

	platform_driver_unregister(&cros_ec_lpc_driver);

	cros_ec_lpc_reg_destroy();

}