From patchwork Fri Oct 16 14:14:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franklin Cooper X-Patchwork-Id: 7415781 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 913C79F36A for ; Fri, 16 Oct 2015 14:16:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9EE1120A56 for ; Fri, 16 Oct 2015 14:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5FA8820734 for ; Fri, 16 Oct 2015 14:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932227AbbJPOQI (ORCPT ); Fri, 16 Oct 2015 10:16:08 -0400 Received: from mail-oi0-f54.google.com ([209.85.218.54]:36317 "EHLO mail-oi0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932327AbbJPOOd (ORCPT ); Fri, 16 Oct 2015 10:14:33 -0400 Received: by oiao187 with SMTP id o187so7644663oia.3; Fri, 16 Oct 2015 07:14:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Tbz5N/z9xDk0XhHPR2lzV9H0eJ3fdQ82HXX699pCLRA=; b=Ru9Qx03Fb7DzL3S2TuYti862hjTd6Cy+EUWu4Etp/NTfSXviWnnkKoeMiTOyMNttZX 3FflrGX27JhKu2ngCO6WPcp8JRekpgpLr7OqXii746Y9C0AAijVS6hdZcJhe0ouVrfKy vAWARarFwtpWG3iDFfjKddkjK6VM9xcrBCU7eoYOtOABi53rnnG2DgHOUFZqAuvUrk7h RwtgxPWB9I7sHcnH1BmwGRKooiyQ5gYvHZBpiBYfyto1f3Ve4yV9oOwXf1+onDdC20hx XIrEY57USy+nkEDJf/uOmSwzWYC/hzjYe1lqr9m3xLbBl0PKBF5hw3Jk4ToqBEq3gQUc /gNA== X-Received: by 10.202.204.67 with SMTP id c64mr9479048oig.93.1445004872764; Fri, 16 Oct 2015 07:14:32 -0700 (PDT) Received: from localhost.localdomain (pool-71-97-41-79.dllstx.fios.verizon.net. [71.97.41.79]) by smtp.gmail.com with ESMTPSA id p3sm8457074oei.9.2015.10.16.07.14.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Oct 2015 07:14:32 -0700 (PDT) From: Franklin S Cooper Jr To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, maxime.ripard@free-electrons.com, LW@KARO-electronics.de, jg1.han@samsung.com, asaf.vertz@tandemg.com Cc: Franklin S Cooper Jr Subject: [PATCH 2/4] Input: edt-ft5x06 - Add support for different max support points Date: Fri, 16 Oct 2015 09:14:27 -0500 Message-Id: <1445004869-31986-3-git-send-email-fcooper@ti.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1445004869-31986-1-git-send-email-fcooper@ti.com> References: <1445004869-31986-1-git-send-email-fcooper@ti.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Update the code so that the maximum supported points aren't hard coded but can be changed. Set the maximum support points based on the data passed along side the compatible field. Signed-off-by: Franklin S Cooper Jr --- Changes since RFC: None drivers/input/touchscreen/edt-ft5x06.c | 56 ++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c index e5b0b5d..34a353b 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c @@ -38,8 +38,7 @@ #include #include #include - -#define MAX_SUPPORT_POINTS 5 +#include #define WORK_REGISTER_THRESHOLD 0x00 #define WORK_REGISTER_REPORT_RATE 0x08 @@ -105,6 +104,7 @@ struct edt_ft5x06_ts_data { int gain; int offset; int report_rate; + int max_support_points; char name[EDT_NAME_LEN]; @@ -112,6 +112,10 @@ struct edt_ft5x06_ts_data { enum edt_ver version; }; +struct edt_i2c_chip_data { + int max_support_points; +}; + static int edt_ft5x06_ts_readwrite(struct i2c_client *client, u16 wr_len, u8 *wr_buf, u16 rd_len, u8 *rd_buf) @@ -181,7 +185,7 @@ static irqreturn_t edt_ft5x06_ts_isr(int irq, void *dev_id) crclen = 1; /* length of the crc data */ /* how many bytes to listen for */ - datalen = tplen * MAX_SUPPORT_POINTS + offset + crclen; + datalen = tplen * tsdata->max_support_points + offset + crclen; break; case M09: @@ -189,7 +193,7 @@ static irqreturn_t edt_ft5x06_ts_isr(int irq, void *dev_id) offset = 1; tplen = 6; crclen = 0; - datalen = tplen * MAX_SUPPORT_POINTS + offset + crclen; + datalen = tplen * tsdata->max_support_points + offset + crclen; break; default: @@ -221,7 +225,7 @@ static irqreturn_t edt_ft5x06_ts_isr(int irq, void *dev_id) goto out; } - for (i = 0; i < MAX_SUPPORT_POINTS; i++) { + for (i = 0; i < tsdata->max_support_points; i++) { u8 *buf = &rdbuf[i * tplen + offset]; bool down; @@ -874,6 +878,32 @@ edt_ft5x06_ts_set_regs(struct edt_ft5x06_ts_data *tsdata) } } +#ifdef CONFIG_OF + +static const struct of_device_id edt_ft5x06_of_match[]; + +static void edt_ft5x06_ts_set_max_support_points(struct device *dev, + struct edt_ft5x06_ts_data *tsdata) +{ + struct edt_i2c_chip_data *chip_data; + const struct of_device_id *match; + + match = of_match_device(of_match_ptr(edt_ft5x06_of_match), dev); + + if (match) { + chip_data = (struct edt_i2c_chip_data *)match->data; + tsdata->max_support_points = chip_data->max_support_points; + } else { + tsdata->max_support_points = 5; + } +} +#else +static void edt_ft5x06_ts_set_max_support_points(struct device *dev, + struct edt_ft5x06_ts_data *tsdata) +{ +} +#endif + static int edt_ft5x06_ts_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -891,6 +921,8 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client, return -ENOMEM; } + edt_ft5x06_ts_set_max_support_points(&client->dev, tsdata); + tsdata->reset_gpio = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(tsdata->reset_gpio)) { @@ -956,7 +988,8 @@ static int edt_ft5x06_ts_probe(struct i2c_client *client, touchscreen_parse_properties(input, true); - error = input_mt_init_slots(input, MAX_SUPPORT_POINTS, INPUT_MT_DIRECT); + error = input_mt_init_slots(input, tsdata->max_support_points, + INPUT_MT_DIRECT); if (error) { dev_err(&client->dev, "Unable to init MT slots.\n"); return error; @@ -1042,10 +1075,15 @@ static const struct i2c_device_id edt_ft5x06_ts_id[] = { MODULE_DEVICE_TABLE(i2c, edt_ft5x06_ts_id); #ifdef CONFIG_OF + +static const struct edt_i2c_chip_data edt_ft5x06_data = { + .max_support_points = 5, +}; + static const struct of_device_id edt_ft5x06_of_match[] = { - { .compatible = "edt,edt-ft5206", }, - { .compatible = "edt,edt-ft5306", }, - { .compatible = "edt,edt-ft5406", }, + { .compatible = "edt,edt-ft5206", .data = &edt_ft5x06_data}, + { .compatible = "edt,edt-ft5306", .data = &edt_ft5x06_data}, + { .compatible = "edt,edt-ft5406", .data = &edt_ft5x06_data}, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, edt_ft5x06_of_match);