diff mbox series

[v2,1/2] Input: edt-ft5x06 - Enable ACPI enumeration

Message ID 20190302180714.90014-2-andriy.shevchenko@linux.intel.com (mailing list archive)
State Mainlined
Commit fc226eb23e62731712b30114479f4a791fee4c00
Headers show
Series Input: edt-ft5x06: Enable for ACPI | expand

Commit Message

Andy Shevchenko March 2, 2019, 6:07 p.m. UTC 
ACPI allows to enumerate specific devices by using compatible strings.
Enable that enumeration for EDT touchscreen devices.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/input/touchscreen/edt-ft5x06.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Comments

Dmitry Torokhov March 4, 2019, 7:32 a.m. UTC | #1 
On Sat, Mar 02, 2019 at 09:07:13PM +0300, Andy Shevchenko wrote:
> ACPI allows to enumerate specific devices by using compatible strings.
> Enable that enumeration for EDT touchscreen devices.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Applied, thank you.

> ---
>  drivers/input/touchscreen/edt-ft5x06.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
> index 1e18ca0d1b4e..bcd3d9d7367f 100644
> --- a/drivers/input/touchscreen/edt-ft5x06.c
> +++ b/drivers/input/touchscreen/edt-ft5x06.c
> @@ -38,7 +38,6 @@
>  #include <linux/gpio/consumer.h>
>  #include <linux/input/mt.h>
>  #include <linux/input/touchscreen.h>
> -#include <linux/of_device.h>
>  
>  #define WORK_REGISTER_THRESHOLD		0x00
>  #define WORK_REGISTER_REPORT_RATE	0x08
> @@ -981,7 +980,7 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client,
>  		return -ENOMEM;
>  	}
>  
> -	chip_data = of_device_get_match_data(&client->dev);
> +	chip_data = device_get_match_data(&client->dev);
>  	if (!chip_data)
>  		chip_data = (const struct edt_i2c_chip_data *)id->driver_data;
>  	if (!chip_data || !chip_data->max_support_points) {
> @@ -1161,7 +1160,6 @@ static const struct i2c_device_id edt_ft5x06_ts_id[] = {
>  };
>  MODULE_DEVICE_TABLE(i2c, edt_ft5x06_ts_id);
>  
> -#ifdef CONFIG_OF
>  static const struct of_device_id edt_ft5x06_of_match[] = {
>  	{ .compatible = "edt,edt-ft5206", .data = &edt_ft5x06_data },
>  	{ .compatible = "edt,edt-ft5306", .data = &edt_ft5x06_data },
> @@ -1172,12 +1170,11 @@ static const struct of_device_id edt_ft5x06_of_match[] = {
>  	{ /* sentinel */ }
>  };
>  MODULE_DEVICE_TABLE(of, edt_ft5x06_of_match);
> -#endif
>  
>  static struct i2c_driver edt_ft5x06_ts_driver = {
>  	.driver = {
>  		.name = "edt_ft5x06",
> -		.of_match_table = of_match_ptr(edt_ft5x06_of_match),
> +		.of_match_table = edt_ft5x06_of_match,
>  		.pm = &edt_ft5x06_ts_pm_ops,
>  	},
>  	.id_table = edt_ft5x06_ts_id,
> -- 
> 2.20.1
>
diff mbox series

Patch

diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 1e18ca0d1b4e..bcd3d9d7367f 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -38,7 +38,6 @@ 
 #include <linux/gpio/consumer.h>
 #include <linux/input/mt.h>
 #include <linux/input/touchscreen.h>
-#include <linux/of_device.h>
 
 #define WORK_REGISTER_THRESHOLD		0x00
 #define WORK_REGISTER_REPORT_RATE	0x08
@@ -981,7 +980,7 @@  static int edt_ft5x06_ts_probe(struct i2c_client *client,
 		return -ENOMEM;
 	}
 
-	chip_data = of_device_get_match_data(&client->dev);
+	chip_data = device_get_match_data(&client->dev);
 	if (!chip_data)
 		chip_data = (const struct edt_i2c_chip_data *)id->driver_data;
 	if (!chip_data || !chip_data->max_support_points) {
@@ -1161,7 +1160,6 @@  static const struct i2c_device_id edt_ft5x06_ts_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, edt_ft5x06_ts_id);
 
-#ifdef CONFIG_OF
 static const struct of_device_id edt_ft5x06_of_match[] = {
 	{ .compatible = "edt,edt-ft5206", .data = &edt_ft5x06_data },
 	{ .compatible = "edt,edt-ft5306", .data = &edt_ft5x06_data },
@@ -1172,12 +1170,11 @@  static const struct of_device_id edt_ft5x06_of_match[] = {
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, edt_ft5x06_of_match);
-#endif
 
 static struct i2c_driver edt_ft5x06_ts_driver = {
 	.driver = {
 		.name = "edt_ft5x06",
-		.of_match_table = of_match_ptr(edt_ft5x06_of_match),
+		.of_match_table = edt_ft5x06_of_match,
 		.pm = &edt_ft5x06_ts_pm_ops,
 	},
 	.id_table = edt_ft5x06_ts_id,