mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Javier Martinez Canillas <javier@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: Javier Martinez Canillas <javier@osg.samsung.com>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	rtc-linux@googlegroups.com,
	Alessandro Zummo <a.zummo@towertech.it>
Subject: [PATCH 13/13] rtc: rs5c372: Add OF device ID table
Date: Fri,  3 Mar 2017 11:29:24 -0300	[thread overview]
Message-ID: <20170303142925.17915-14-javier@osg.samsung.com> (raw)
In-Reply-To: <20170303142925.17915-1-javier@osg.samsung.com>

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-rs5c372.c | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c
index c8c757466783..d4eff8d7131f 100644
--- a/drivers/rtc/rtc-rs5c372.c
+++ b/drivers/rtc/rtc-rs5c372.c
@@ -15,6 +15,7 @@
 #include <linux/bcd.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 
 /*
  * Ricoh has a family of I2C based RTCs, which differ only slightly from
@@ -83,6 +84,35 @@ static const struct i2c_device_id rs5c372_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, rs5c372_id);
 
+static const struct of_device_id rs5c372_of_match[] = {
+	{
+		.compatible = "ricoh,r2025sd",
+		.data = (void *)rtc_r2025sd
+	},
+	{
+		.compatible = "ricoh,r2221tl",
+		.data = (void *)rtc_r2221tl
+	},
+	{
+		.compatible = "ricoh,rs5c372a",
+		.data = (void *)rtc_rs5c372a
+	},
+	{
+		.compatible = "ricoh,rs5c372b",
+		.data = (void *)rtc_rs5c372b
+	},
+	{
+		.compatible = "ricoh,rv5c386",
+		.data = (void *)rtc_rv5c386
+	},
+	{
+		.compatible = "ricoh,rv5c387a",
+		.data = (void *)rtc_rv5c387a
+	},
+	{ }
+};
+MODULE_DEVICE_TABLE(of, rs5c372_of_match);
+
 /* REVISIT:  this assumes that:
  *  - we're in the 21st century, so it's safe to ignore the century
  *    bit for rv5c38[67] (REG_MONTH bit 7);
@@ -581,7 +611,11 @@ static int rs5c372_probe(struct i2c_client *client,
 
 	rs5c372->client = client;
 	i2c_set_clientdata(client, rs5c372);
-	rs5c372->type = id->driver_data;
+	if (client->dev.of_node)
+		rs5c372->type = (enum rtc_type)
+			of_device_get_match_data(&client->dev);
+	else
+		rs5c372->type = id->driver_data;
 
 	/* we read registers 0x0f then 0x00-0x0f; skip the first one */
 	rs5c372->regs = &rs5c372->buf[1];
@@ -673,6 +707,7 @@ static int rs5c372_remove(struct i2c_client *client)
 static struct i2c_driver rs5c372_driver = {
 	.driver		= {
 		.name	= "rtc-rs5c372",
+		.of_match_table = of_match_ptr(rs5c372_of_match),
 	},
 	.probe		= rs5c372_probe,
 	.remove		= rs5c372_remove,
-- 
2.9.3

  parent reply	other threads:[~2017-03-03 14:30 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-03 14:29 [PATCH 00/13] rtc: Add OF device table to I2C drivers that are missing it Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 01/13] rtc: rv8803: Add OF device ID table Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 02/13] rtc: rv3029: " Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 03/13] rtc: bq32k: " Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 04/13] rtc: ds1307: " Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 05/13] rtc: rx8010: " Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 06/13] rtc: ds3232: " Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 07/13] rtc: rtc-ds1672: " Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 08/13] rtc: ds1374: Set .of_match_table to " Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 09/13] rtc: isl1208: Add " Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 10/13] rtc: s35390a: " Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 11/13] rtc: rx8581: " Javier Martinez Canillas
2017-03-03 14:29 ` [PATCH 12/13] rtc: m41t80: " Javier Martinez Canillas
2017-03-03 14:29 ` Javier Martinez Canillas [this message]
2017-03-03 15:01 ` [PATCH 00/13] rtc: Add OF device table to I2C drivers that are missing it Alexandre Belloni
2017-03-03 15:27   ` Javier Martinez Canillas
2017-03-03 16:04     ` Alexandre Belloni
2017-03-03 17:08       ` Javier Martinez Canillas
2017-03-09  0:30 ` Alexandre Belloni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170303142925.17915-14-javier@osg.samsung.com \
    --to=javier@osg.samsung.com \
    --cc=a.zummo@towertech.it \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rtc-linux@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®