linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] Input: silead - Add OF device ID table
@ 2017-02-21 18:12 Javier Martinez Canillas
  2017-02-21 18:12 ` [PATCH 2/3] Input: synaptics_i2c " Javier Martinez Canillas
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Javier Martinez Canillas @ 2017-02-21 18:12 UTC (permalink / raw)
  To: linux-kernel
  Cc: Javier Martinez Canillas, Hans de Goede, platform-driver-x86,
	Dmitry Torokhov, linux-input

The driver doesn't have a struct of_device_id table but supported devices
are registered via Device Trees. This is working on the assumption that a
I2C device registered via OF will always match a legacy I2C device ID and
that the MODALIAS reported will always be of the form i2c:<device>.

But this could change in the future so the correct approach is to have an
OF device ID table if the devices are registered via OF.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 drivers/input/touchscreen/silead.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/input/touchscreen/silead.c b/drivers/input/touchscreen/silead.c
index 404830a4a366..aae3ba1c3e02 100644
--- a/drivers/input/touchscreen/silead.c
+++ b/drivers/input/touchscreen/silead.c
@@ -580,12 +580,26 @@ static const struct acpi_device_id silead_ts_acpi_match[] = {
 MODULE_DEVICE_TABLE(acpi, silead_ts_acpi_match);
 #endif
 
+#ifdef CONFIG_OF
+static const struct of_device_id silead_ts_of_match[] = {
+	{ .compatible = "silead,gsl1680" },
+	{ .compatible = "silead,gsl1688" },
+	{ .compatible = "silead,gsl3670" },
+	{ .compatible = "silead,gsl3675" },
+	{ .compatible = "silead,gsl3692" },
+	{ .compatible = "silead,mssl1680" },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, silead_ts_of_match);
+#endif
+
 static struct i2c_driver silead_ts_driver = {
 	.probe = silead_ts_probe,
 	.id_table = silead_ts_id,
 	.driver = {
 		.name = SILEAD_TS_NAME,
 		.acpi_match_table = ACPI_PTR(silead_ts_acpi_match),
+		.of_match_table = of_match_ptr(silead_ts_of_match),
 		.pm = &silead_ts_pm,
 	},
 };
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2017-02-23 12:40 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-21 18:12 [PATCH 1/3] Input: silead - Add OF device ID table Javier Martinez Canillas
2017-02-21 18:12 ` [PATCH 2/3] Input: synaptics_i2c " Javier Martinez Canillas
2017-02-23  8:31   ` Dmitry Torokhov
2017-02-23 12:40     ` Javier Martinez Canillas
2017-02-21 18:12 ` [PATCH 3/3] Input: qt1070 " Javier Martinez Canillas
2017-02-23  8:25   ` Dmitry Torokhov
2017-02-23  8:27     ` Dmitry Torokhov
2017-02-23 12:39       ` Javier Martinez Canillas
2017-02-22  8:29 ` [PATCH 1/3] Input: silead " Hans de Goede
2017-02-22 12:45   ` Javier Martinez Canillas
2017-02-22 14:23     ` Hans de Goede
2017-02-22 14:25       ` Javier Martinez Canillas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).