Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1592008

[PATCH 01/13] rtc: rv8803: Add OF device ID table

Show all headers | View raw

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/rtc/rtc-rv8803.c | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c
index f9277e536f7e..9ad97ab29866 100644
--- a/drivers/rtc/rtc-rv8803.c
+++ b/drivers/rtc/rtc-rv8803.c
@@ -18,6 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/rtc.h>
 
 #define RV8803_I2C_TRY_COUNT		4
@@ -556,7 +557,11 @@ static int rv8803_probe(struct i2c_client *client,
 
 	mutex_init(&rv8803->flags_lock);
 	rv8803->client = client;
-	rv8803->type = id->driver_data;
+	if (client->dev.of_node)
+		rv8803->type = (enum rv8803_type)
+			of_device_get_match_data(&client->dev);
+	else
+		rv8803->type = id->driver_data;
 	i2c_set_clientdata(client, rv8803);
 
 	flags = rv8803_read_reg(client, RV8803_FLAG);
@@ -627,9 +632,23 @@ static const struct i2c_device_id rv8803_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, rv8803_id);
 
+static const struct of_device_id rv8803_of_match[] = {
+	{
+		.compatible = "microcrystal,rv8803",
+		.data = (void *)rx_8900
+	},
+	{
+		.compatible = "epson,rx8900",
+		.data = (void *)rx_8900
+	},
+	{ }
+};
+MODULE_DEVICE_TABLE(of, rv8803_of_match);
+
 static struct i2c_driver rv8803_driver = {
 	.driver = {
 		.name = "rtc-rv8803",
+		.of_match_table = of_match_ptr(rv8803_of_match),
 	},
 	.probe		= rv8803_probe,
 	.remove		= rv8803_remove,
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/13] rtc: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-03 15:40 +0100
  [PATCH 08/13] rtc: ds1374: Set .of_match_table to OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-03 15:40 +0100
  [PATCH 02/13] rtc: rv3029: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-03 15:40 +0100
  [PATCH 05/13] rtc: rx8010: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-03 15:40 +0100
  [PATCH 07/13] rtc: rtc-ds1672: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-03 15:40 +0100
  [PATCH 01/13] rtc: rv8803: Add OF device ID table Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-03 15:40 +0100
  Re: [PATCH 00/13] rtc: Add OF device table to I2C drivers that are  missing it Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-03-03 16:20 +0100
    Re: [PATCH 00/13] rtc: Add OF device table to I2C drivers that are  missing it Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-03 16:50 +0100
      Re: [PATCH 00/13] rtc: Add OF device table to I2C drivers that are  missing it Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-03-03 17:30 +0100
        Re: [PATCH 00/13] rtc: Add OF device table to I2C drivers that are  missing it Javier Martinez Canillas <javier@osg.samsung.com> - 2017-03-03 18:20 +0100
  Re: [PATCH 00/13] rtc: Add OF device table to I2C drivers that are  missing it Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2017-03-09 04:40 +0100

csiph-web