linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Patil, Rachna" <rachna@ti.com>
To: linux-doc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org,
	linux-kernel@vger.kernel.org, linux-input@vger.kernel.org,
	linux-iio@vger.kernel.org
Cc: Rob Landley <rob@landley.net>,
	Grant Likely <grant.likely@secretlab.ca>,
	Rob Herring <rob.herring@calxeda.com>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Dmitry Torokhov <dtor@mail.ru>,
	Jonathan Cameron <jic23@cam.ac.uk>,
	"Patil, Rachna" <rachna@ti.com>
Subject: [PATCH RESEND 7/7] IIO: ti_am335x_adc: Add DT support
Date: Wed, 7 Nov 2012 12:22:04 +0530	[thread overview]
Message-ID: <1352271124-5513-8-git-send-email-rachna@ti.com> (raw)
In-Reply-To: <1352271124-5513-1-git-send-email-rachna@ti.com>

Add DT support for client ADC driver.

Signed-off-by: Patil, Rachna <rachna@ti.com>
---
 drivers/iio/adc/ti_am335x_adc.c |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index 02a43c8..1f1ec0c 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>
@@ -141,11 +143,18 @@ static int __devinit tiadc_probe(struct platform_device *pdev)
 	struct iio_dev		*indio_dev;
 	struct tiadc_device	*adc_dev;
 	struct ti_tscadc_dev	*tscadc_dev = pdev->dev.platform_data;
-	struct mfd_tscadc_board	*pdata;
+	struct mfd_tscadc_board	*pdata = NULL;
+	struct device_node	*node = NULL;
 	int			err;
+	u32			val32;
 
-	pdata = tscadc_dev->dev->platform_data;
-	if (!pdata || !pdata->adc_init) {
+	if (tscadc_dev->dev->of_node) {
+		node = tscadc_dev->dev->of_node;
+		node = of_find_node_by_name(node, "adc");
+	} else
+		pdata = tscadc_dev->dev->platform_data;
+
+	if (!pdata && !node) {
 		dev_err(&pdev->dev, "Could not find platform data\n");
 		return -EINVAL;
 	}
@@ -159,7 +168,14 @@ static int __devinit 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;
+	if (node) {
+		err = of_property_read_u32(node, "adc-channels", &val32);
+		if (err < 0)
+			goto err_free_device;
+		else
+			adc_dev->channels = val32;
+	} else
+		adc_dev->channels = pdata->adc_init->adc_channels;
 
 	indio_dev->dev.parent = &pdev->dev;
 	indio_dev->name = dev_name(&pdev->dev);
-- 
1.7.0.4

  parent reply	other threads:[~2012-11-07  6:52 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-07  6:51 [PATCH RESEND 0/7] MFD: ti_am335x_tscadc: DT support and TSC features addition Patil, Rachna
2012-11-07  6:51 ` [PATCH RESEND 1/7] input: ti_am335x_tsc: Step enable bits made configurable Patil, Rachna
2012-11-07  6:51 ` [PATCH RESEND 2/7] input: ti_am335x_tsc: Order of TSC wires, " Patil, Rachna
2012-11-07  6:52 ` [PATCH RESEND 3/7] input: ti_am335x_tsc: Add variance filter Patil, Rachna
2012-11-21 18:33   ` Dmitry Torokhov
     [not found]     ` <20121121183350.GB18950-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>
2012-11-27  7:07       ` Patil, Rachna
2012-11-07  6:52 ` [PATCH RESEND 4/7] MFD: ti_am335x_tscadc: add device tree binding information Patil, Rachna
     [not found] ` <1352271124-5513-1-git-send-email-rachna-l0cyMroinI0@public.gmane.org>
2012-11-07  6:52   ` [PATCH RESEND 5/7] MFD: ti_am335x_tscadc: Add DT support Patil, Rachna
2012-11-07  6:52 ` [PATCH RESEND 6/7] input: ti_am335x_tsc: " Patil, Rachna
     [not found]   ` <1352271124-5513-7-git-send-email-rachna-l0cyMroinI0@public.gmane.org>
2012-11-21 18:32     ` Dmitry Torokhov
2012-11-27  7:11       ` Patil, Rachna
2012-11-07  6:52 ` Patil, Rachna [this message]
2012-11-16 10:33 ` [PATCH RESEND 0/7] MFD: ti_am335x_tscadc: DT support and TSC features addition Patil, Rachna
     [not found]   ` <4CE347531D4CA947960AF71FF095B9323E96C54A-Er742YJ7I/eIQmiDNMet8wC/G2K4zDHf@public.gmane.org>
2012-11-21 17:00     ` Samuel Ortiz
2012-11-27  7:14       ` Patil, Rachna

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=1352271124-5513-8-git-send-email-rachna@ti.com \
    --to=rachna@ti.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=dtor@mail.ru \
    --cc=grant.likely@secretlab.ca \
    --cc=jic23@cam.ac.uk \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rob.herring@calxeda.com \
    --cc=rob@landley.net \
    --cc=sameo@linux.intel.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).