Commit d1b5b5e7 authored by Sascha Hauer's avatar Sascha Hauer Committed by Alexey Mednyy

input: touchscreen mc13xxx: Make platform data optional

The platform data once was optional, male it optional again. This
is a first step toward devicetree support for the mc13xxx touchscreen
Signed-off-by: default avatarSascha Hauer <>
parent c253ed32
......@@ -39,7 +39,8 @@ struct mc13783_ts_priv {
struct delayed_work work;
struct workqueue_struct *workq;
unsigned int sample[4];
struct mc13xxx_ts_platform_data *touch;
u8 ato;
bool atox;
static irqreturn_t mc13783_ts_handler(int irq, void *data)
......@@ -127,7 +128,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)
......@@ -171,6 +172,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;
......@@ -182,11 +184,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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment