Re: [PATCH RESEND 07/13] platform/chrome: cros_ec_lpc: Add support for GOOG004 ACPI device

[Benson Leung <bleung@google.com>]

[-- Attachment #1: Type: text/plain, Size: 3595 bytes --]

Hi Enric and Thierry,

On Tue, May 16, 2017 at 06:13:13PM +0200, Enric Balletbo i Serra wrote:
> From: Gwendal Grignou <gwendal@chromium.org>
> 
> 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: Gwendal Grignou <gwendal@chromium.org>
> Signed-off-by: Thierry Escande <thierry.escande@collabora.com>

Signed-off-by: Benson Leung <bleung@chromium.org>

Applied to what will become the immutable branch.

> ---
>  drivers/platform/chrome/Kconfig       |  2 +-
>  drivers/platform/chrome/cros_ec_lpc.c | 23 +++++++++--------------
>  2 files changed, 10 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig
> index 6d80fb5..0ad6e29 100644
> --- a/drivers/platform/chrome/Kconfig
> +++ b/drivers/platform/chrome/Kconfig
> @@ -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
> diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c
> index bc2dc62..90703521 100644
> --- a/drivers/platform/chrome/cros_ec_lpc.c
> +++ b/drivers/platform/chrome/cros_ec_lpc.c
> @@ -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();
>  }
> -- 
> 2.9.3
> 

-- 
Benson Leung
Staff Software Engineer
Chrome OS Kernel
Google Inc.
bleung@google.com
Chromium OS Project
bleung@chromium.org

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]