From mboxrd@z Thu Jan 1 00:00:00 1970 From: yegorslists@googlemail.com Subject: [PATCH 2/3] tps6507x-ts: add DT support Date: Fri, 24 Feb 2017 16:42:25 +0100 Message-ID: <1487950946-18590-3-git-send-email-yegorslists@googlemail.com> References: <1487950946-18590-1-git-send-email-yegorslists@googlemail.com> Return-path: Received: from mail-wr0-f196.google.com ([209.85.128.196]:36398 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751299AbdBXPmx (ORCPT ); Fri, 24 Feb 2017 10:42:53 -0500 Received: by mail-wr0-f196.google.com with SMTP id o22so1829137wro.3 for ; Fri, 24 Feb 2017 07:42:52 -0800 (PST) In-Reply-To: <1487950946-18590-1-git-send-email-yegorslists@googlemail.com> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, andrej.skvortzov@gmail.com, Yegor Yefremov From: Yegor Yefremov This patch adds support for DT to tps6507x-ts driver. Signed-off-by: Yegor Yefremov --- drivers/input/touchscreen/tps6507x-ts.c | 70 ++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/drivers/input/touchscreen/tps6507x-ts.c b/drivers/input/touchscreen/tps6507x-ts.c index 5bf1ec6..2d61220 100644 --- a/drivers/input/touchscreen/tps6507x-ts.c +++ b/drivers/input/touchscreen/tps6507x-ts.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include #define TSC_DEFAULT_POLL_PERIOD 30 /* ms */ #define TPS_DEFAULT_MIN_PRESSURE 0x30 @@ -199,33 +201,52 @@ static void tps6507x_ts_poll(struct input_polled_dev *poll_dev) tps6507x_adc_standby(tsc); } +static void tsc_init_data(struct tps6507x_ts *tsc, + struct input_dev *input_dev) +{ + struct device_node *node = tsc->dev->of_node; + const struct tps6507x_board *tps_board = + dev_get_platdata(tsc->dev); + const struct touchscreen_init_data *init_data = NULL; + + if (tps_board) + /* + * init_data points to array of touchscreen_init structure + * coming from the board-evm file. + */ + init_data = tps_board->tps6507x_ts_init_data; + + if (node == NULL && init_data == NULL) { + tsc->poll_dev->poll_interval = TSC_DEFAULT_POLL_PERIOD; + tsc->min_pressure = TPS_DEFAULT_MIN_PRESSURE; + } else if (init_data) { + tsc->poll_dev->poll_interval = init_data->poll_period; + tsc->min_pressure = init_data->min_pressure; + input_dev->id.vendor = init_data->vendor; + input_dev->id.product = init_data->product; + input_dev->id.version = init_data->version; + } else if (node) { + of_property_read_u32(node, "ti,poll-period", + &tsc->poll_dev->poll_interval); + of_property_read_u16(node, "ti,min-pressure", + &tsc->min_pressure); + of_property_read_u16(node, "ti,vendor", + &input_dev->id.vendor); + of_property_read_u16(node, "ti,product", + &input_dev->id.product); + of_property_read_u16(node, "ti,version", + &input_dev->id.version); + } +} + static int tps6507x_ts_probe(struct platform_device *pdev) { struct tps6507x_dev *tps6507x_dev = dev_get_drvdata(pdev->dev.parent); - const struct tps6507x_board *tps_board; - const struct touchscreen_init_data *init_data; struct tps6507x_ts *tsc; struct input_polled_dev *poll_dev; struct input_dev *input_dev; int error; - /* - * tps_board points to pmic related constants - * coming from the board-evm file. - */ - tps_board = dev_get_platdata(tps6507x_dev->dev); - if (!tps_board) { - dev_err(tps6507x_dev->dev, - "Could not find tps6507x platform data\n"); - return -ENODEV; - } - - /* - * init_data points to array of regulator_init structures - * coming from the board-evm file. - */ - init_data = tps_board->tps6507x_ts_init_data; - tsc = devm_kzalloc(&pdev->dev, sizeof(struct tps6507x_ts), GFP_KERNEL); if (!tsc) { dev_err(tps6507x_dev->dev, "failed to allocate driver data\n"); @@ -234,8 +255,6 @@ static int tps6507x_ts_probe(struct platform_device *pdev) tsc->mfd = tps6507x_dev; tsc->dev = tps6507x_dev->dev; - tsc->min_pressure = init_data ? - init_data->min_pressure : TPS_DEFAULT_MIN_PRESSURE; snprintf(tsc->phys, sizeof(tsc->phys), "%s/input0", dev_name(tsc->dev)); @@ -251,8 +270,6 @@ static int tps6507x_ts_probe(struct platform_device *pdev) poll_dev->private = tsc; poll_dev->poll = tps6507x_ts_poll; - poll_dev->poll_interval = init_data ? - init_data->poll_period : TSC_DEFAULT_POLL_PERIOD; input_dev = poll_dev->input; input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); @@ -266,11 +283,8 @@ static int tps6507x_ts_probe(struct platform_device *pdev) input_dev->phys = tsc->phys; input_dev->dev.parent = tsc->dev; input_dev->id.bustype = BUS_I2C; - if (init_data) { - input_dev->id.vendor = init_data->vendor; - input_dev->id.product = init_data->product; - input_dev->id.version = init_data->version; - } + + tsc_init_data(tsc, input_dev); error = tps6507x_adc_standby(tsc); if (error) -- 2.1.4