From patchwork Thu Jan 24 03:45:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Patil, Rachna" X-Patchwork-Id: 2029001 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 0F357DF264 for ; Thu, 24 Jan 2013 03:48:59 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TyDlu-0006R1-8a; Thu, 24 Jan 2013 03:46:38 +0000 Received: from bear.ext.ti.com ([192.94.94.41]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TyDkc-0005ti-DV for linux-arm-kernel@lists.infradead.org; Thu, 24 Jan 2013 03:45:22 +0000 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r0O3jAns016884; Wed, 23 Jan 2013 21:45:11 -0600 Received: from DBDE71.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id r0O3jAIh002871; Thu, 24 Jan 2013 09:15:10 +0530 (IST) Received: from dbdp32.itg.ti.com (172.24.170.251) by DBDE71.ent.ti.com (172.24.170.149) with Microsoft SMTP Server id 14.1.323.3; Thu, 24 Jan 2013 09:15:10 +0530 Received: from ucmsshproxy.india.ext.ti.com (dbdp20.itg.ti.com [172.24.170.38]) by dbdp32.itg.ti.com (8.13.8/8.13.8) with SMTP id r0O3j9dH016168; Thu, 24 Jan 2013 09:15:09 +0530 Received: from symphony.india.ext.ti.com (unknown [192.168.247.13]) by ucmsshproxy.india.ext.ti.com (Postfix) with ESMTP id 8A566158003; Thu, 24 Jan 2013 09:15:09 +0530 (IST) Received: from ubuntu-psp-linux.india.ext.ti.com (ubuntu-psp-linux [192.168.247.46]) by symphony.india.ext.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id r0O3j9R15512; Thu, 24 Jan 2013 09:15:09 +0530 (IST) From: "Patil, Rachna" To: , , , , , , Subject: [PATCH v4 6/8] input: ti_am335x_tsc: Add DT support Date: Thu, 24 Jan 2013 09:15:10 +0530 Message-ID: <1358999112-31192-7-git-send-email-rachna@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358999112-31192-1-git-send-email-rachna@ti.com> References: <1358999112-31192-1-git-send-email-rachna@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130123_224518_705720_9DC895A1 X-CRM114-Status: GOOD ( 18.52 ) X-Spam-Score: -4.6 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [192.94.94.41 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Russell King , Samuel Ortiz , Tony Lindgren , Dmitry Torokhov , Dmitry Torokhov , Rob Herring , gururaja.hebbar@ti.com, Grant Likely , Jonathan Cameron , Rob Landley , "Patil, Rachna" , Benit Cousson X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: "Patil, Rachna" Add DT support for client touchscreen driver Signed-off-by: Patil, Rachna --- Changes in v4: Non-standard properties prefixed with vendor name. drivers/input/touchscreen/ti_am335x_tsc.c | 94 +++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 13 deletions(-) diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index 064d2b2..6ff5a76 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c @@ -26,6 +26,8 @@ #include #include #include +#include +#include #include @@ -366,6 +368,74 @@ static irqreturn_t titsc_irq(int irq, void *dev) return IRQ_HANDLED; } +static int titsc_parse_dt(struct ti_tscadc_dev *tscadc_dev, + struct titsc *ts_dev) +{ + struct device_node *node = tscadc_dev->dev->of_node; + int err, i; + u32 val32, wires_conf[4]; + + if (!node) + return -EINVAL; + else { + node = of_find_node_by_name(node, "tsc"); + if (!node) + return -EINVAL; + else { + err = of_property_read_u32(node, "ti,wires", &val32); + if (err < 0) + goto error_ret; + else + ts_dev->wires = val32; + + err = of_property_read_u32(node, + "ti,x-plate-resistance", &val32); + if (err < 0) + goto error_ret; + else + ts_dev->x_plate_resistance = val32; + + err = of_property_read_u32(node, + "ti,steps-to-configure", &val32); + if (err < 0) + goto error_ret; + else + ts_dev->steps_to_configure = val32; + + err = of_property_read_u32_array(node, "ti,wire-config", + wires_conf, ARRAY_SIZE(wires_conf)); + if (err < 0) + goto error_ret; + else { + for (i = 0; i < ARRAY_SIZE(wires_conf); i++) + ts_dev->config_inp[i] = wires_conf[i]; + } + } + } + return 0; + +error_ret: + 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. */ @@ -375,16 +445,8 @@ static int titsc_probe(struct platform_device *pdev) struct titsc *ts_dev; struct input_dev *input_dev; struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data; - struct mfd_tscadc_board *pdata; int err; - pdata = tscadc_dev->dev->platform_data; - - if (!pdata) { - dev_err(&pdev->dev, "Could not find platform data\n"); - return -EINVAL; - } - /* Allocate memory for device */ ts_dev = kzalloc(sizeof(struct titsc), GFP_KERNEL); input_dev = input_allocate_device(); @@ -398,11 +460,17 @@ static int titsc_probe(struct platform_device *pdev) ts_dev->mfd_tscadc = tscadc_dev; ts_dev->input = input_dev; ts_dev->irq = tscadc_dev->irq; - 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)); + + if (tscadc_dev->dev->platform_data) + err = titsc_parse_pdata(tscadc_dev, ts_dev); + else + err = titsc_parse_dt(tscadc_dev, ts_dev); + + if (err) { + dev_err(&pdev->dev, "Could not find platform data\n"); + err = -EINVAL; + goto err_free_mem; + } err = request_irq(ts_dev->irq, titsc_irq, 0, pdev->dev.driver->name, ts_dev);