linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: 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,
	"Sebastian Andrzej Siewior" <bigeasy@linutronix.de>
Subject: [PATCH 10/21] mfd: ti_am335x_tscadc: remove platform_data support
Date: Wed, 12 Jun 2013 18:58:11 +0200	[thread overview]
Message-ID: <1371056302-12714-11-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1371056302-12714-1-git-send-email-bigeasy@linutronix.de>

This patch removes access to platform data mfd_tscadc_board because the
platform is DT only.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 drivers/mfd/ti_am335x_tscadc.c |   23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index 292d34e..e78b9df 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -26,8 +26,6 @@
 #include <linux/of_device.h>
 
 #include <linux/mfd/ti_am335x_tscadc.h>
-#include <linux/input/ti_am335x_tsc.h>
-#include <linux/platform_data/ti_am335x_adc.h>
 
 static unsigned int tscadc_readl(struct ti_tscadc_dev *tsadc, unsigned int reg)
 {
@@ -91,31 +89,22 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
 	struct ti_tscadc_dev	*tscadc;
 	struct resource		*res;
 	struct clk		*clk;
-	struct mfd_tscadc_board	*pdata = pdev->dev.platform_data;
 	struct device_node	*node = pdev->dev.of_node;
 	struct mfd_cell		*cell;
 	int			err, ctrl;
 	int			clk_value, clock_rate;
 	int			tsc_wires = 0, adc_channels = 0, total_channels;
 
-	if (!pdata && !pdev->dev.of_node) {
-		dev_err(&pdev->dev, "Could not find platform data\n");
+	if (!pdev->dev.of_node) {
+		dev_err(&pdev->dev, "Could not find valid DT data.\n");
 		return -EINVAL;
 	}
 
-	if (pdev->dev.platform_data) {
-		if (pdata->tsc_init)
-			tsc_wires = pdata->tsc_init->wires;
+	node = of_get_child_by_name(pdev->dev.of_node, "tsc");
+	of_property_read_u32(node, "ti,wires", &tsc_wires);
 
-		if (pdata->adc_init)
-			adc_channels = pdata->adc_init->adc_channels;
-	} else {
-		node = of_get_child_by_name(pdev->dev.of_node, "tsc");
-		of_property_read_u32(node, "ti,wires", &tsc_wires);
-
-		node = of_get_child_by_name(pdev->dev.of_node, "adc");
-		of_property_read_u32(node, "ti,adc-channels", &adc_channels);
-	}
+	node = of_get_child_by_name(pdev->dev.of_node, "adc");
+	of_property_read_u32(node, "ti,adc-channels", &adc_channels);
 
 	total_channels = tsc_wires + adc_channels;
 
-- 
1.7.10.4

  parent reply	other threads:[~2013-06-12 16:58 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-12 16:58 am335x: TSC & ADC reworking including DT pieces, take 5 Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 01/21] mfd: input: iio: ti_am335x_adc: use one structure for ti_tscadc_dev Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 02/21] input: ti_am33x_tsc: Step enable bits made configurable Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 03/21] input: ti_am33x_tsc: Order of TSC wires, " Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 04/21] input: ti_am33x_tsc: remove unwanted fifo flush Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 05/21] input: ti_am33x_tsc: Add DT support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 06/21] input: ti_am33x_tsc: remove platform_data support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 07/21] iio: ti_am335x_adc: Add DT support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 08/21] iio: ti_am335x_adc: remove platform_data support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 09/21] mfd: ti_am335x_tscadc: Add DT support Sebastian Andrzej Siewior
2013-06-12 16:58 ` Sebastian Andrzej Siewior [this message]
2013-06-12 16:58 ` [PATCH 11/21] iio: ti_tscadc: provide datasheet_name and scan_type Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 12/21] mfd: ti_tscadc: deal with partial activation Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 13/21] arm: am33xx: add TSC/ADC mfd device support Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 14/21] input: mfd: ti_am335x_tsc remove remaining platform data pieces Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 15/21] mfd: input: ti_am335x_tsc: rename device from tsc to TI-am335x-tsc Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 16/21] mfd: iio: ti_am335x_adc: rename device from tiadc to TI-am335x-adc Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 17/21] input: ti_am335x_adc: use only FIFO0 and clean up a little Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 18/21] input: ti_am335x_tsc: ACK the HW_PEN irq in ISR Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 19/21] input: ti_am335x_tsc: return IRQ_NONE if there was no IRQ for us Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 20/21] iio: ti_am335x_adc: Allow to specify input line Sebastian Andrzej Siewior
2013-06-12 16:58 ` [PATCH 21/21] iio: ti_am335x_adc: check if we found the value Sebastian Andrzej Siewior
     [not found] ` <1371056302-12714-1-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-13  9:07   ` am335x: TSC & ADC reworking including DT pieces, take 5 Samuel Ortiz
2013-06-13  9:25     ` Sebastian Andrzej Siewior
     [not found]       ` <51B99006.2060103-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-13  9:37         ` Samuel Ortiz

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=1371056302-12714-11-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=linux-iio@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --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).