From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: Lee Jones <lee.jones@linaro.org>, Samuel Ortiz <sameo@linux.intel.com>
Cc: "Benoît Cousson" <b-cousson@ti.com>,
"Tony Lindgren" <tony@atomide.com>,
"Jonathan Cameron" <jic23@cam.ac.uk>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
"Felipe Balbi" <balbi@ti.com>,
linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
linux-iio@vger.kernel.org, linux-input@vger.kernel.org, "Patil,
Rachna" <rachna@ti.com>,
"Pantelis Antoniou" <panto@antoniou-consulting.com>,
"Sebastian Andrzej Siewior" <bigeasy@linutronix.de>
Subject: [PATCH 08/22] iio/ti_am335x_adc: Add DT support
Date: Tue, 11 Jun 2013 13:30:54 +0200 [thread overview]
Message-ID: <1370950268-7224-9-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1370950268-7224-1-git-send-email-bigeasy@linutronix.de>
From: "Patil, Rachna" <rachna@ti.com>
Add DT support for client ADC driver.
[ panto@antoniou-consulting.com : use of_get_child_by_name
instead of of_find_node_by_name ]
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Signed-off-by: Patil, Rachna <rachna@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
[bigeasy: shift the code to the left, fix clean up on
of_get_child_by_name() failer, provide OF binding in mfd, use
own of node, get rid of of_get_child_by_name()]
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/iio/adc/ti_am335x_adc.c | 29 ++++++++++++++++++++++++-----
drivers/mfd/ti_am335x_tscadc.c | 1 +
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 543b9c4..b24402c 100644
--- a/drivers/iio/adc/ti_am335x_adc.c
+++ b/drivers/iio/adc/ti_am335x_adc.c
@@ -22,6 +22,8 @@
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/iio/iio.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/mfd/ti_am335x_tscadc.h>
#include <linux/platform_data/ti_am335x_adc.h>
@@ -152,11 +154,12 @@ static int tiadc_probe(struct platform_device *pdev)
struct iio_dev *indio_dev;
struct tiadc_device *adc_dev;
struct ti_tscadc_dev *tscadc_dev = ti_tscadc_dev_get(pdev);
- struct mfd_tscadc_board *pdata;
+ struct mfd_tscadc_board *pdata = tscadc_dev->dev->platform_data;
+ struct device_node *node = pdev->dev.of_node;
int err;
+ u32 val32;
- pdata = tscadc_dev->dev->platform_data;
- if (!pdata || !pdata->adc_init) {
+ if (!pdata && !node) {
dev_err(&pdev->dev, "Could not find platform data\n");
return -EINVAL;
}
@@ -169,8 +172,17 @@ static int tiadc_probe(struct platform_device *pdev)
}
adc_dev = iio_priv(indio_dev);
- adc_dev->mfd_tscadc = tscadc_dev;
- adc_dev->channels = pdata->adc_init->adc_channels;
+ adc_dev->mfd_tscadc = ti_tscadc_dev_get(pdev);
+
+ if (pdata)
+ adc_dev->channels = pdata->adc_init->adc_channels;
+ else {
+ err = of_property_read_u32(node,
+ "ti,adc-channels", &val32);
+ if (err < 0)
+ goto err_free_device;
+ adc_dev->channels = val32;
+ }
indio_dev->dev.parent = &pdev->dev;
indio_dev->name = dev_name(&pdev->dev);
@@ -260,11 +272,18 @@ static const struct dev_pm_ops tiadc_pm_ops = {
#define TIADC_PM_OPS NULL
#endif
+static const struct of_device_id ti_adc_dt_ids[] = {
+ { .compatible = "ti,am3359-adc", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, ti_adc_dt_ids);
+
static struct platform_driver tiadc_driver = {
.driver = {
.name = "tiadc",
.owner = THIS_MODULE,
.pm = TIADC_PM_OPS,
+ .of_match_table = of_match_ptr(ti_adc_dt_ids),
},
.probe = tiadc_probe,
.remove = tiadc_remove,
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index 15a01f6..eaaa253 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -191,6 +191,7 @@ static int ti_tscadc_probe(struct platform_device *pdev)
/* ADC Cell */
cell = &tscadc->cells[ADC_CELL];
cell->name = "tiadc";
+ cell->of_compatible = "ti,am3359-adc";
cell->platform_data = &tscadc;
cell->pdata_size = sizeof(tscadc);
--
1.7.10.4
next prev parent reply other threads:[~2013-06-11 11:30 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-11 11:30 am335x: TSC & ADC reworking including DT pieces, take 4 Sebastian Andrzej Siewior
2013-06-11 11:30 ` [PATCH 01/22] mfd/ti_am335x_tscadc: remove regmap Sebastian Andrzej Siewior
2013-06-11 14:23 ` Samuel Ortiz
2013-06-11 14:34 ` Sebastian Andrzej Siewior
[not found] ` <51B7358D.7000605-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-14 13:53 ` Mark Brown
[not found] ` <20130614135358.GR1403-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2013-06-17 11:41 ` Sebastian Andrzej Siewior
[not found] ` <51BEF5F4.4090600-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-17 16:03 ` Mark Brown
2013-07-04 9:02 ` Sebastian Andrzej Siewior
2013-07-04 10:45 ` Mark Brown
[not found] ` <20130704104511.GU27646-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2013-07-04 11:15 ` Sebastian Andrzej Siewior
2013-06-11 11:30 ` [PATCH 02/22] mfd & input & iio/ti_am335x_adc: use one structure for ti_tscadc_dev Sebastian Andrzej Siewior
2013-06-11 11:30 ` [PATCH 03/22] input/ti_am33x_tsc: Step enable bits made configurable Sebastian Andrzej Siewior
2013-06-11 11:30 ` [PATCH 04/22] input/ti_am33x_tsc: Order of TSC wires, " Sebastian Andrzej Siewior
[not found] ` <1370950268-7224-5-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-11 14:23 ` Samuel Ortiz
2013-06-11 14:35 ` Sebastian Andrzej Siewior
2013-07-04 11:14 ` Sekhar Nori
[not found] ` <51D5592F.6050208-l0cyMroinI0@public.gmane.org>
2013-07-04 11:33 ` Sebastian Andrzej Siewior
[not found] ` <51D55D80.6080803-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-07-04 13:39 ` Sekhar Nori
2013-07-04 13:50 ` Sebastian Andrzej Siewior
2013-07-04 14:27 ` Sekhar Nori
2013-06-11 11:30 ` [PATCH 05/22] input/ti_am33x_tsc: remove unwanted fifo flush Sebastian Andrzej Siewior
[not found] ` <1370950268-7224-1-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-11 11:30 ` [PATCH 06/22] input/ti_am33x_tsc: Add DT support Sebastian Andrzej Siewior
2013-06-11 11:31 ` [PATCH 17/22] mfd & iio/ti_am335x_adc: rename device from tiadc to TI-am335x-adc Sebastian Andrzej Siewior
2013-06-11 12:05 ` am335x: TSC & ADC reworking including DT pieces, take 4 Lee Jones
2013-06-11 13:53 ` Lars-Peter Clausen
2013-06-11 11:30 ` [PATCH 07/22] input/ti_am33x_tsc: remove platform_data support Sebastian Andrzej Siewior
2013-06-11 11:30 ` Sebastian Andrzej Siewior [this message]
2013-06-11 11:30 ` [PATCH 09/22] iio/ti_am335x_adc: " Sebastian Andrzej Siewior
2013-06-11 11:30 ` [PATCH 10/22] mfd/ti_am335x_tscadc: Add DT support Sebastian Andrzej Siewior
2013-06-11 14:23 ` Samuel Ortiz
2013-06-11 14:42 ` Sebastian Andrzej Siewior
2013-06-11 15:05 ` Samuel Ortiz
2013-06-11 15:41 ` Sebastian Andrzej Siewior
2013-06-11 18:42 ` Lee Jones
[not found] ` <51B73756.5010004-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-11 17:10 ` Lee Jones
2013-06-11 11:30 ` [PATCH 11/22] mfd/ti_am335x_tscadc: remove platform_data support Sebastian Andrzej Siewior
2013-06-11 11:30 ` [PATCH 12/22] iio/ti_tscadc: provide datasheet_name and scan_type Sebastian Andrzej Siewior
2013-06-11 11:30 ` [PATCH 13/22] mfd/ti_tscadc: deal with partial activation Sebastian Andrzej Siewior
2013-06-11 11:31 ` [PATCH 14/22] arm/am33xx: add TSC/ADC mfd device support Sebastian Andrzej Siewior
[not found] ` <1370950268-7224-15-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-07-04 13:49 ` Sekhar Nori
[not found] ` <51D57D4F.30905-l0cyMroinI0@public.gmane.org>
2013-07-04 13:51 ` Sebastian Andrzej Siewior
2013-06-11 11:31 ` [PATCH 15/22] input & mfd: ti_am335x_tsc remove remaining platform data pieces Sebastian Andrzej Siewior
2013-06-11 11:31 ` [PATCH 16/22] mfd & input/ti_am335x_tsc: rename device from tsc to TI-am335x-tsc Sebastian Andrzej Siewior
2013-06-11 11:31 ` [PATCH 18/22] input/ti_am335x_adc: use only FIFO0 and clean up a little Sebastian Andrzej Siewior
2013-06-11 11:31 ` [PATCH 19/22] input/ti_am335x_tsc: ACK the HW_PEN irq in ISR Sebastian Andrzej Siewior
2013-06-11 11:31 ` [PATCH 20/22] input/ti_am335x_tsc: return IRQ_NONE if there was no IRQ for us Sebastian Andrzej Siewior
2013-06-11 11:31 ` [PATCH 21/22] iio/ti_am335x_adc: Allow to specify input line Sebastian Andrzej Siewior
2013-06-11 11:31 ` [PATCH 22/22] iio/ti_am335x_adc: check if we found the value Sebastian Andrzej Siewior
2013-06-11 14:23 ` am335x: TSC & ADC reworking including DT pieces, take 4 Samuel Ortiz
2013-06-11 15:29 ` Sebastian Andrzej Siewior
[not found] ` <51B74252.5090906-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-11 16:10 ` Samuel Ortiz
2013-06-11 16:18 ` Sebastian Andrzej Siewior
2013-06-14 13:57 ` Mark Brown
2013-06-11 16:04 ` Dmitry Torokhov
[not found] ` <20130611160415.GA379-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>
2013-06-11 16:15 ` Samuel Ortiz
2013-06-11 16:27 ` Jonathan Cameron
[not found] ` <1565f2fb-7f16-4910-8fa2-cd5700e8986d-2ueSQiBKiTY7tOexoI0I+QC/G2K4zDHf@public.gmane.org>
2013-06-11 17:01 ` Lars-Peter Clausen
2013-06-11 17:55 ` Samuel Ortiz
2013-06-12 13:29 ` Sebastian Andrzej Siewior
[not found] ` <51B877C7.8080001-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-12 13:50 ` Samuel Ortiz
2013-06-12 14:02 ` Sebastian Andrzej Siewior
2013-06-12 14:41 ` Samuel Ortiz
2013-06-12 15:00 ` Sebastian Andrzej Siewior
2013-06-11 18:02 ` 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=1370950268-7224-9-git-send-email-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=b-cousson@ti.com \
--cc=balbi@ti.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jic23@cam.ac.uk \
--cc=lee.jones@linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=panto@antoniou-consulting.com \
--cc=rachna@ti.com \
--cc=sameo@linux.intel.com \
--cc=tony@atomide.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;
as well as URLs for NNTP newsgroup(s).