From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: linux-input@vger.kernel.org, linux-iio@vger.kernel.org
Cc: Samuel Ortiz <sameo@linux.intel.com>,
Jonathan Cameron <jic23@cam.ac.uk>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Felipe Balbi <balbi@ti.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Subject: [PATCH 06/19] input/ti_am33x_tsc: remove platform_data support
Date: Mon, 27 May 2013 21:11:53 +0200 [thread overview]
Message-ID: <1369681926-22185-7-git-send-email-bigeasy@linutronix.de> (raw)
In-Reply-To: <1369681926-22185-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/input/touchscreen/ti_am335x_tsc.c | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index b7d3c23..b467196 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -24,7 +24,6 @@
#include <linux/clk.h>
#include <linux/platform_device.h>
#include <linux/io.h>
-#include <linux/input/ti_am335x_tsc.h>
#include <linux/delay.h>
#include <linux/of.h>
#include <linux/of_device.h>
@@ -425,24 +424,6 @@ static int titsc_parse_dt(struct ti_tscadc_dev *tscadc_dev,
return err;
}
-static int titsc_parse_pdata(struct ti_tscadc_dev *tscadc_dev,
- struct titsc *ts_dev)
-{
- struct mfd_tscadc_board *pdata = tscadc_dev->dev->platform_data;
-
- if (!pdata)
- return -EINVAL;
-
- ts_dev->wires = pdata->tsc_init->wires;
- ts_dev->x_plate_resistance =
- pdata->tsc_init->x_plate_resistance;
- ts_dev->steps_to_configure =
- pdata->tsc_init->steps_to_configure;
- memcpy(ts_dev->config_inp, pdata->tsc_init->wire_config,
- sizeof(pdata->tsc_init->wire_config));
- return 0;
-}
-
/*
* The functions for inserting/removing driver as a module.
*/
@@ -468,13 +449,9 @@ static int titsc_probe(struct platform_device *pdev)
ts_dev->input = input_dev;
ts_dev->irq = tscadc_dev->irq;
- if (tscadc_dev->dev->platform_data)
- err = titsc_parse_pdata(tscadc_dev, ts_dev);
- else
- err = titsc_parse_dt(tscadc_dev, ts_dev);
-
+ err = titsc_parse_dt(tscadc_dev, ts_dev);
if (err) {
- dev_err(&pdev->dev, "Could not find platform data\n");
+ dev_err(&pdev->dev, "Could not find valid DT data.\n");
err = -EINVAL;
goto err_free_mem;
}
--
1.7.10.4
next prev parent reply other threads:[~2013-05-27 19:12 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-27 19:11 am335x: touch & adc patches Sebastian Andrzej Siewior
[not found] ` <1369681926-22185-1-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-05-27 19:11 ` [PATCH 01/19] input: touchscreen: am335x: Step enable bits made configurable Sebastian Andrzej Siewior
2013-05-27 19:11 ` [PATCH 03/19] input: touchscreen: am335x: remove unwanted fifo flush Sebastian Andrzej Siewior
2013-05-27 19:11 ` [PATCH 04/19] input: touchscreen: am335x: Add DT support Sebastian Andrzej Siewior
2013-05-27 19:11 ` [PATCH 05/19] input: ti_am335x_tsc: Add variance filters Sebastian Andrzej Siewior
2013-06-04 16:43 ` Dmitry Torokhov
2013-06-04 16:54 ` Sebastian Andrzej Siewior
2013-05-27 19:11 ` [PATCH 08/19] iio/ti_am335x_adc: remove platform_data support Sebastian Andrzej Siewior
[not found] ` <1369681926-22185-9-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-02 17:22 ` Jonathan Cameron
2013-05-27 19:11 ` [PATCH 09/19] mfd: ti_am335x_tscadc: Add DT support Sebastian Andrzej Siewior
2013-05-27 19:11 ` [PATCH 10/19] mfd/ti_am335x_tscadc: remove platform_data support Sebastian Andrzej Siewior
2013-05-27 19:11 ` [PATCH 11/19] iio & mfd: ti_tscadc: Update with IIO map interface & deal with partial activation Sebastian Andrzej Siewior
[not found] ` <1369681926-22185-12-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-02 17:40 ` Jonathan Cameron
[not found] ` <51AB838B.5060602-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-06-04 10:19 ` Sebastian Andrzej Siewior
2013-05-27 19:12 ` [PATCH 14/19] Documentation/DT bindings: add info for TI TSC ADC Sebastian Andrzej Siewior
[not found] ` <1369681926-22185-15-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-02 17:48 ` Jonathan Cameron
[not found] ` <51AB8568.9050104-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-06-04 10:24 ` Sebastian Andrzej Siewior
2013-05-27 19:12 ` [PATCH 15/19] input/ti_am335x_tsc: tiny cleanup Sebastian Andrzej Siewior
2013-06-02 17:49 ` Jonathan Cameron
2013-06-04 10:27 ` Sebastian Andrzej Siewior
2013-06-04 16:49 ` Dmitry Torokhov
2013-05-27 19:12 ` [PATCH 18/19] mfd/ti_am335x_tscadc: add a module alias for modprobe Sebastian Andrzej Siewior
2013-05-27 19:11 ` [PATCH 02/19] input: touchscreen: am335x: Order of TSC wires, made configurable Sebastian Andrzej Siewior
2013-05-27 19:11 ` Sebastian Andrzej Siewior [this message]
[not found] ` <1369681926-22185-7-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-04 16:44 ` [PATCH 06/19] input/ti_am33x_tsc: remove platform_data support Dmitry Torokhov
2013-05-27 19:11 ` [PATCH 07/19] iio: adc: am335x: Add DT support Sebastian Andrzej Siewior
[not found] ` <1369681926-22185-8-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-02 16:58 ` Jonathan Cameron
[not found] ` <51AB79CE.2000001-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-06-04 10:12 ` Sebastian Andrzej Siewior
[not found] ` <20130604101202.GA1151-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-04 16:57 ` Dmitry Torokhov
2013-05-27 19:11 ` [PATCH 12/19] iio & mfd & input: ti_tscadc: Match mfd sub devices to regmap interface Sebastian Andrzej Siewior
2013-06-02 17:46 ` Jonathan Cameron
[not found] ` <51AB84F5.2030405-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-06-04 10:23 ` Sebastian Andrzej Siewior
[not found] ` <20130604102318.GC1151-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-04 10:25 ` Pantelis Antoniou
[not found] ` <F58DCC19-20B7-4385-B323-C1A2E5F22641-wVdstyuyKrO8r51toPun2/C9HSW9iNxf@public.gmane.org>
2013-06-04 10:52 ` Sebastian Andrzej Siewior
[not found] ` <20130604105210.GI1151-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-04 10:54 ` Pantelis Antoniou
2013-06-04 11:05 ` Sebastian Andrzej Siewior
[not found] ` <20130604110532.GJ1151-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-04 11:10 ` Pantelis Antoniou
2013-05-27 19:12 ` [PATCH 13/19] arm: dts: am33xx: add TSC/ADC mfd device support Sebastian Andrzej Siewior
2013-05-27 19:12 ` [PATCH 16/19] mfd / input: ti_am335x_tsc: rename device from tsc to TI-tsc Sebastian Andrzej Siewior
[not found] ` <1369681926-22185-17-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-04 16:50 ` Dmitry Torokhov
[not found] ` <20130604165035.GE26400-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>
2013-06-04 17:29 ` Sebastian Andrzej Siewior
2013-05-27 19:12 ` [PATCH 17/19] mfd / iio: ti_am335x_adc: rename device from tiadc to TI-adc Sebastian Andrzej Siewior
[not found] ` <1369681926-22185-18-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-06-02 17:50 ` Jonathan Cameron
[not found] ` <51AB85DB.2000305-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2013-06-04 10:28 ` Sebastian Andrzej Siewior
2013-05-27 19:12 ` [PATCH 19/19] mfd/ti_am335x_tscadc: add private lock/unlock function for regmap read/write Sebastian Andrzej Siewior
[not found] ` <1369681926-22185-20-git-send-email-bigeasy-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-05-29 8:46 ` [PATCH 19/19 v2] " Sebastian Andrzej Siewior
[not found] ` <20130529084642.GA18273-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
2013-05-29 11:12 ` Mark Brown
[not found] ` <20130529111253.GR3660-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2013-05-29 11:25 ` Lars-Peter Clausen
[not found] ` <51A5E5B3.80201-Qo5EllUWu/uELgA04lAiVw@public.gmane.org>
2013-05-29 14:31 ` Sebastian Andrzej Siewior
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=1369681926-22185-7-git-send-email-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--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=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).