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>, <linux-omap@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Cc: Samuel Ortiz <sameo@linux.intel.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Dmitry Torokhov <dtor@mail.ru>,
Rob Herring <rob.herring@calxeda.com>,
Jonathan Cameron <jic23@cam.ac.uk>,
Tony Lindgren <tony@atomide.com>,
Benit Cousson <b-cousson@ti.com>,
Grant Likely <grant.likely@secretlab.ca>,
Rob Landley <rob@landley.net>,
Russell King <linux@arm.linux.org.uk>,
"Patil, Rachna" <rachna@ti.com>
Subject: [PATCH v3 7/8] IIO: ti_am335x_adc: Add DT support
Date: Fri, 18 Jan 2013 16:18:49 +0530 [thread overview]
Message-ID: <cd7783f3c96ef38f95c1ee85736f115754feec68.1358502134.git.rachna@ti.com> (raw)
In-Reply-To: <cover.1358502134.git.rachna@ti.com>
From: "Patil, Rachna" <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 | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/adc/ti_am335x_adc.c b/drivers/iio/adc/ti_am335x_adc.c
index cd030e1..81ca8e5 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,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 = pdev->dev.platform_data;
- struct mfd_tscadc_board *pdata;
+ struct mfd_tscadc_board *pdata = tscadc_dev->dev->platform_data;
+ struct device_node *node = tscadc_dev->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;
}
@@ -159,7 +162,22 @@ 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;
+
+ if (pdata)
+ adc_dev->channels = pdata->adc_init->adc_channels;
+ else {
+ node = of_find_node_by_name(node, "adc");
+ if (!node)
+ return -EINVAL;
+ else {
+ err = of_property_read_u32(node,
+ "adc-channels", &val32);
+ if (err < 0)
+ goto err_free_device;
+ else
+ adc_dev->channels = val32;
+ }
+ }
indio_dev->dev.parent = &pdev->dev;
indio_dev->name = dev_name(&pdev->dev);
--
1.7.9.5
next prev parent reply other threads:[~2013-01-18 10:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-18 10:44 [PATCH v3 0/8] MFD: ti_am335x_tscadc: DT support and TSC features addition Patil, Rachna
2013-01-18 10:47 ` [PATCH v3 1/8] input: ti_am335x_tsc: Step enable bits made configurable Patil, Rachna
2013-01-18 10:47 ` [PATCH v3 2/8] input: ti_am335x_tsc: Order of TSC wires, " Patil, Rachna
2013-01-18 10:48 ` [PATCH v3 3/8] input: touchscreen: ti_tsc: remove unwanted fifo flush Patil, Rachna
2013-01-27 13:55 ` Peter Korsgaard
2013-01-18 10:48 ` [PATCH v3 4/8] MFD: ti_am335x_tscadc: add device tree binding information Patil, Rachna
2013-01-19 22:28 ` Lars-Peter Clausen
2013-01-22 9:31 ` Patil, Rachna
2013-01-18 10:48 ` [PATCH v3 5/8] MFD: ti_am335x_tscadc: Add DT support Patil, Rachna
2013-01-18 10:48 ` [PATCH v3 6/8] input: ti_am335x_tsc: " Patil, Rachna
2013-01-18 10:48 ` Patil, Rachna [this message]
2013-01-18 10:48 ` [PATCH v3 8/8] arm/dts: AM335x-evm: Add TSC/ADC MFD device support 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=cd7783f3c96ef38f95c1ee85736f115754feec68.1358502134.git.rachna@ti.com \
--to=rachna@ti.com \
--cc=b-cousson@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-arm-kernel@lists.infradead.org \
--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=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--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).