From: Florian Vaussard <florian.vaussard@gmail.com>
To: devicetree@vger.kernel.org, Jonathan Cameron <jic23@kernel.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Cc: Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>, Peter Rosin <peda@axentia.se>,
Slawomir Stepien <sst@poczta.fm>,
Joachim Eastwood <manabian@gmail.com>,
Matt Ranostay <mranostay@gmail.com>,
Cristina Moraru <cristina.moraru09@gmail.com>,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
Florian Vaussard <florian.vaussard@heig-vd.ch>
Subject: [PATCH 3/3] iio: potentiometer: mcp4531: Add device tree binding
Date: Tue, 21 Jun 2016 08:55:37 +0200 [thread overview]
Message-ID: <1466492137-32683-4-git-send-email-florian.vaussard@heig-vd.ch> (raw)
In-Reply-To: <1466492137-32683-1-git-send-email-florian.vaussard@heig-vd.ch>
This patch adds the necessary device tree binding to allow DT probing of
currently supported parts.
Signed-off-by: Florian Vaussard <florian.vaussard@heig-vd.ch>
---
drivers/iio/potentiometer/mcp4531.c | 83 ++++++++++++++++++++++++++++++++++++-
1 file changed, 82 insertions(+), 1 deletion(-)
diff --git a/drivers/iio/potentiometer/mcp4531.c b/drivers/iio/potentiometer/mcp4531.c
index 2251173..41a1e46 100644
--- a/drivers/iio/potentiometer/mcp4531.c
+++ b/drivers/iio/potentiometer/mcp4531.c
@@ -31,6 +31,8 @@
#include <linux/module.h>
#include <linux/i2c.h>
#include <linux/err.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/iio/iio.h>
@@ -188,12 +190,84 @@ static const struct iio_info mcp4531_info = {
.driver_module = THIS_MODULE,
};
+#ifdef CONFIG_OF
+static const struct of_device_id mcp45xx_of_match[] = {
+ { .compatible = "microchip,mcp4531-502", .data = (void *)MCP453x_502 },
+ { .compatible = "microchip,mcp4531-103", .data = (void *)MCP453x_103 },
+ { .compatible = "microchip,mcp4531-503", .data = (void *)MCP453x_503 },
+ { .compatible = "microchip,mcp4531-104", .data = (void *)MCP453x_104 },
+ { .compatible = "microchip,mcp4532-502", .data = (void *)MCP453x_502 },
+ { .compatible = "microchip,mcp4532-103", .data = (void *)MCP453x_103 },
+ { .compatible = "microchip,mcp4532-503", .data = (void *)MCP453x_503 },
+ { .compatible = "microchip,mcp4532-104", .data = (void *)MCP453x_104 },
+ { .compatible = "microchip,mcp4541-502", .data = (void *)MCP454x_502 },
+ { .compatible = "microchip,mcp4541-103", .data = (void *)MCP454x_103 },
+ { .compatible = "microchip,mcp4541-503", .data = (void *)MCP454x_503 },
+ { .compatible = "microchip,mcp4541-104", .data = (void *)MCP454x_104 },
+ { .compatible = "microchip,mcp4542-502", .data = (void *)MCP454x_502 },
+ { .compatible = "microchip,mcp4542-103", .data = (void *)MCP454x_103 },
+ { .compatible = "microchip,mcp4542-503", .data = (void *)MCP454x_503 },
+ { .compatible = "microchip,mcp4542-104", .data = (void *)MCP454x_104 },
+ { .compatible = "microchip,mcp4551-502", .data = (void *)MCP455x_502 },
+ { .compatible = "microchip,mcp4551-103", .data = (void *)MCP455x_103 },
+ { .compatible = "microchip,mcp4551-503", .data = (void *)MCP455x_503 },
+ { .compatible = "microchip,mcp4551-104", .data = (void *)MCP455x_104 },
+ { .compatible = "microchip,mcp4552-502", .data = (void *)MCP455x_502 },
+ { .compatible = "microchip,mcp4552-103", .data = (void *)MCP455x_103 },
+ { .compatible = "microchip,mcp4552-503", .data = (void *)MCP455x_503 },
+ { .compatible = "microchip,mcp4552-104", .data = (void *)MCP455x_104 },
+ { .compatible = "microchip,mcp4561-502", .data = (void *)MCP456x_502 },
+ { .compatible = "microchip,mcp4561-103", .data = (void *)MCP456x_103 },
+ { .compatible = "microchip,mcp4561-503", .data = (void *)MCP456x_503 },
+ { .compatible = "microchip,mcp4561-104", .data = (void *)MCP456x_104 },
+ { .compatible = "microchip,mcp4562-502", .data = (void *)MCP456x_502 },
+ { .compatible = "microchip,mcp4562-103", .data = (void *)MCP456x_103 },
+ { .compatible = "microchip,mcp4562-503", .data = (void *)MCP456x_503 },
+ { .compatible = "microchip,mcp4562-104", .data = (void *)MCP456x_104 },
+ { .compatible = "microchip,mcp4631-502", .data = (void *)MCP463x_502 },
+ { .compatible = "microchip,mcp4631-103", .data = (void *)MCP463x_103 },
+ { .compatible = "microchip,mcp4631-503", .data = (void *)MCP463x_503 },
+ { .compatible = "microchip,mcp4631-104", .data = (void *)MCP463x_104 },
+ { .compatible = "microchip,mcp4632-502", .data = (void *)MCP463x_502 },
+ { .compatible = "microchip,mcp4632-103", .data = (void *)MCP463x_103 },
+ { .compatible = "microchip,mcp4632-503", .data = (void *)MCP463x_503 },
+ { .compatible = "microchip,mcp4632-104", .data = (void *)MCP463x_104 },
+ { .compatible = "microchip,mcp4641-502", .data = (void *)MCP464x_502 },
+ { .compatible = "microchip,mcp4641-103", .data = (void *)MCP464x_103 },
+ { .compatible = "microchip,mcp4641-503", .data = (void *)MCP464x_503 },
+ { .compatible = "microchip,mcp4641-104", .data = (void *)MCP464x_104 },
+ { .compatible = "microchip,mcp4642-502", .data = (void *)MCP464x_502 },
+ { .compatible = "microchip,mcp4642-103", .data = (void *)MCP464x_103 },
+ { .compatible = "microchip,mcp4642-503", .data = (void *)MCP464x_503 },
+ { .compatible = "microchip,mcp4642-104", .data = (void *)MCP464x_104 },
+ { .compatible = "microchip,mcp4651-502", .data = (void *)MCP465x_502 },
+ { .compatible = "microchip,mcp4651-103", .data = (void *)MCP465x_103 },
+ { .compatible = "microchip,mcp4651-503", .data = (void *)MCP465x_503 },
+ { .compatible = "microchip,mcp4651-104", .data = (void *)MCP465x_104 },
+ { .compatible = "microchip,mcp4652-502", .data = (void *)MCP465x_502 },
+ { .compatible = "microchip,mcp4652-103", .data = (void *)MCP465x_103 },
+ { .compatible = "microchip,mcp4652-503", .data = (void *)MCP465x_503 },
+ { .compatible = "microchip,mcp4652-104", .data = (void *)MCP465x_104 },
+ { .compatible = "microchip,mcp4661-502", .data = (void *)MCP466x_502 },
+ { .compatible = "microchip,mcp4661-103", .data = (void *)MCP466x_103 },
+ { .compatible = "microchip,mcp4661-503", .data = (void *)MCP466x_503 },
+ { .compatible = "microchip,mcp4661-104", .data = (void *)MCP466x_104 },
+ { .compatible = "microchip,mcp4662-502", .data = (void *)MCP466x_502 },
+ { .compatible = "microchip,mcp4662-103", .data = (void *)MCP466x_103 },
+ { .compatible = "microchip,mcp4662-503", .data = (void *)MCP466x_503 },
+ { .compatible = "microchip,mcp4662-104", .data = (void *)MCP466x_104 },
+ { /*sentinel*/ }
+};
+#endif
+
static int mcp4531_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct device *dev = &client->dev;
+ unsigned long devid;
struct mcp4531_data *data;
struct iio_dev *indio_dev;
+ const struct of_device_id *match;
if (!i2c_check_functionality(client->adapter,
I2C_FUNC_SMBUS_WORD_DATA)) {
@@ -201,13 +275,19 @@ static int mcp4531_probe(struct i2c_client *client,
return -EOPNOTSUPP;
}
+ match = of_match_device(of_match_ptr(mcp45xx_of_match), dev);
+ if (match)
+ devid = (int)of_device_get_match_data(dev);
+ else
+ devid = id->driver_data;
+
indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
if (!indio_dev)
return -ENOMEM;
data = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev);
data->client = client;
- data->cfg = &mcp4531_cfg[id->driver_data];
+ data->cfg = &mcp4531_cfg[devid];
indio_dev->dev.parent = dev;
indio_dev->info = &mcp4531_info;
@@ -290,6 +370,7 @@ MODULE_DEVICE_TABLE(i2c, mcp4531_id);
static struct i2c_driver mcp4531_driver = {
.driver = {
.name = "mcp4531",
+ .of_match_table = of_match_ptr(mcp45xx_of_match),
},
.probe = mcp4531_probe,
.id_table = mcp4531_id,
--
2.5.0
next prev parent reply other threads:[~2016-06-21 6:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 6:55 [PATCH 0/3] iio: potentiometer: mcp4531: New parts and device tree Florian Vaussard
[not found] ` <1466492137-32683-1-git-send-email-florian.vaussard-EWQkb/GNqlFyDzI6CaY1VQ@public.gmane.org>
2016-06-21 6:55 ` [PATCH 1/3] iio: potentiometer: mcp4531: Add support for MCP454x, MCP456x, MCP464x and MCP466x Florian Vaussard
[not found] ` <1466492137-32683-2-git-send-email-florian.vaussard-EWQkb/GNqlFyDzI6CaY1VQ@public.gmane.org>
2016-06-21 7:28 ` Peter Rosin
2016-06-26 14:53 ` [PATCH 0/3] iio: potentiometer: mcp4531: New parts and device tree Jonathan Cameron
2016-06-21 6:55 ` [PATCH 2/3] iio: potentiometer: mcp4531: Add device tree binding documentation Florian Vaussard
2016-06-21 7:38 ` Peter Rosin
[not found] ` <f763a2ea-6a82-a8f6-4afb-d09dba240927-koto5C5qi+TLoDKTGw+V6w@public.gmane.org>
2016-06-21 7:49 ` Florian Vaussard
[not found] ` <5768F180.4080601-EWQkb/GNqlFyDzI6CaY1VQ@public.gmane.org>
2016-06-21 21:37 ` Rob Herring
[not found] ` <1466492137-32683-3-git-send-email-florian.vaussard-EWQkb/GNqlFyDzI6CaY1VQ@public.gmane.org>
2016-06-21 21:43 ` Rob Herring
2016-06-22 6:19 ` Florian Vaussard
2016-06-21 6:55 ` Florian Vaussard [this message]
[not found] ` <1466492137-32683-4-git-send-email-florian.vaussard-EWQkb/GNqlFyDzI6CaY1VQ@public.gmane.org>
2016-06-21 7:34 ` [PATCH 3/3] iio: potentiometer: mcp4531: Add device tree binding kbuild test robot
2016-06-21 7:51 ` Peter Rosin
[not found] ` <bf4dbd64-aac8-aba3-ec5c-4cd4d0e848f6-koto5C5qi+TLoDKTGw+V6w@public.gmane.org>
2016-06-22 6:22 ` Florian Vaussard
[not found] ` <829a4507-39d7-e04a-9672-6309def89ee2-EWQkb/GNqlFyDzI6CaY1VQ@public.gmane.org>
2016-06-22 7:06 ` Peter Rosin
[not found] ` <dfdbc7dd-8457-c0ef-9f0e-e2c1d96e5b11-koto5C5qi+TLoDKTGw+V6w@public.gmane.org>
2016-06-23 8:50 ` Florian Vaussard
[not found] ` <576BA2DD.2060501-EWQkb/GNqlFyDzI6CaY1VQ@public.gmane.org>
2016-06-26 14:53 ` Jonathan Cameron
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=1466492137-32683-4-git-send-email-florian.vaussard@heig-vd.ch \
--to=florian.vaussard@gmail.com \
--cc=cristina.moraru09@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=florian.vaussard@heig-vd.ch \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manabian@gmail.com \
--cc=mark.rutland@arm.com \
--cc=mranostay@gmail.com \
--cc=pawel.moll@arm.com \
--cc=peda@axentia.se \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
--cc=sst@poczta.fm \
/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;
as well as URLs for NNTP newsgroup(s).