From: Lukasz Majewski <lukma@denx.de>
To: Lee Jones <lee.jones@linaro.org>
Cc: linux-kernel@vger.kernel.org,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Enrico Weigelt <info@metux.net>,
Thomas Gleixner <tglx@linutronix.de>,
Kate Stewart <kstewart@linuxfoundation.org>,
linux-input@vger.kernel.org, Lukasz Majewski <lukma@denx.de>
Subject: [PATCH v4 2/3] input: touchscreen mc13xxx: Make platform data optional
Date: Thu, 18 Jul 2019 00:26:01 +0200 [thread overview]
Message-ID: <20190717222602.2912-3-lukma@denx.de> (raw)
In-Reply-To: <20190717222602.2912-1-lukma@denx.de>
From: Sascha Hauer <s.hauer@pengutronix.de>
The platform data once was optional, make it optional again. This
is a first step towards device tree support for the mc13xxx touchscreen
driver.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Lukasz Majewski <lukma@denx.de>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
Changes for v4:
- Add Dmitry's Acked-by:
Changes for v3:
- None
Changes for v2:
- None
Changes from the original patch:
- Commit message typo fixes
---
drivers/input/touchscreen/mc13783_ts.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
index ae0d978c83bf..edd49e44e0c9 100644
--- a/drivers/input/touchscreen/mc13783_ts.c
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -35,7 +35,8 @@ struct mc13783_ts_priv {
struct mc13xxx *mc13xxx;
struct delayed_work work;
unsigned int sample[4];
- struct mc13xxx_ts_platform_data *touch;
+ u8 ato;
+ bool atox;
};
static irqreturn_t mc13783_ts_handler(int irq, void *data)
@@ -125,7 +126,7 @@ static void mc13783_ts_work(struct work_struct *work)
if (mc13xxx_adc_do_conversion(priv->mc13xxx,
mode, channel,
- priv->touch->ato, priv->touch->atox,
+ priv->ato, priv->atox,
priv->sample) == 0)
mc13783_ts_report_sample(priv);
}
@@ -169,6 +170,7 @@ static void mc13783_ts_close(struct input_dev *dev)
static int __init mc13783_ts_probe(struct platform_device *pdev)
{
struct mc13783_ts_priv *priv;
+ struct mc13xxx_ts_platform_data *pdata = dev_get_platdata(&pdev->dev);
struct input_dev *idev;
int ret = -ENOMEM;
@@ -180,11 +182,10 @@ static int __init mc13783_ts_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&priv->work, mc13783_ts_work);
priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);
priv->idev = idev;
- priv->touch = dev_get_platdata(&pdev->dev);
- if (!priv->touch) {
- dev_err(&pdev->dev, "missing platform data\n");
- ret = -ENODEV;
- goto err_free_mem;
+
+ if (pdata) {
+ priv->atox = pdata->atox;
+ priv->ato = pdata->ato;
}
idev->name = MC13783_TS_NAME;
--
2.11.0
next prev parent reply other threads:[~2019-07-17 22:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 22:25 [PATCH v4 0/3] mfd: mc13xxx: Fixes and enhancements for NXP's mc34708 Lukasz Majewski
2019-07-17 22:26 ` [PATCH v4 1/3] mfd: mc13xxx: Add mc34708 adc support Lukasz Majewski
2019-07-25 12:36 ` Lee Jones
2019-07-25 16:20 ` Lukasz Majewski
2019-08-02 13:19 ` Lukasz Majewski
2019-08-12 10:08 ` Lee Jones
2019-07-17 22:26 ` Lukasz Majewski [this message]
2019-07-17 22:26 ` [PATCH v4 3/3] input: touchscreen mc13xxx: Add mc34708 support Lukasz Majewski
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=20190717222602.2912-3-lukma@denx.de \
--to=lukma@denx.de \
--cc=dmitry.torokhov@gmail.com \
--cc=info@metux.net \
--cc=kstewart@linuxfoundation.org \
--cc=lee.jones@linaro.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=tglx@linutronix.de \
/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).