From patchwork Mon Sep 9 21:44:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 11138571 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC4C5912 for ; Mon, 9 Sep 2019 21:45:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAE3521A4C for ; Mon, 9 Sep 2019 21:45:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726930AbfIIVpH (ORCPT ); Mon, 9 Sep 2019 17:45:07 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:58285 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391889AbfIIVpH (ORCPT ); Mon, 9 Sep 2019 17:45:07 -0400 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 46S1sr3fJSz1rJgl; Mon, 9 Sep 2019 23:45:04 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 46S1sr2qdxz1qqkC; Mon, 9 Sep 2019 23:45:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id qZ8-lsPCxhJx; Mon, 9 Sep 2019 23:45:03 +0200 (CEST) X-Auth-Info: Aeq2wPB2g8JLijVeAgGXkDVoKmffLOMiGQJTIMBEAIw= Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Mon, 9 Sep 2019 23:45:02 +0200 (CEST) From: Lukasz Majewski To: Lee Jones Cc: linux-kernel@vger.kernel.org, Dmitry Torokhov , Sascha Hauer , Enrico Weigelt , Kate Stewart , linux-input@vger.kernel.org, Greg Kroah-Hartman , Lukasz Majewski Subject: [PATCH v5 3/3] input: touchscreen mc13xxx: Add mc34708 support Date: Mon, 9 Sep 2019 23:44:40 +0200 Message-Id: <20190909214440.30674-4-lukma@denx.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190909214440.30674-1-lukma@denx.de> References: <20190909214440.30674-1-lukma@denx.de> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Sascha Hauer The mc34708 has a different bit to enable pen detection. This adds the driver data and devtype necessary to probe the device and to distinguish between the mc13783 and the mc34708. Signed-off-by: Sascha Hauer Signed-off-by: Lukasz Majewski Acked-by: Dmitry Torokhov --- Changes for v5: - None Changes for v4: - Remove type from struct mc13xx_chip - Add Acked-by from Dmitry Changes for v3: - Replace forward declaration of mc13xxx_driver_data with structure definition - Rename mc13xxx_driver_data with mc13xxx_chip - Move static struct mc13xxx_chip mc13783_chip and mc34708_chip closer to ID table - Do not check mc13xxx device type Changes for v2: - Change nested if statements to a single one (with cr0 > ...) - Replace hardcoded max resistance value (4080) with a generic driver data value. - Introduce new include/linux/mfd/mc34708.h header file for mc34708 specific defines - Define as driver data mask and value for accessing mc13xxx registers Changes from the original patch: - Simplify the mcXXXXX_set_pen_detection functions - Fix checkpatch warnings --- --- drivers/input/touchscreen/mc13783_ts.c | 48 +++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c index edd49e44e0c9..1dd8ed396225 100644 --- a/drivers/input/touchscreen/mc13783_ts.c +++ b/drivers/input/touchscreen/mc13783_ts.c @@ -10,6 +10,7 @@ */ #include #include +#include #include #include #include @@ -30,6 +31,12 @@ MODULE_PARM_DESC(sample_tolerance, "is supposed to be wrong and is discarded. Set to 0 to " "disable this check."); +struct mc13xxx_chip { + int max_resistance; + u32 reg_mask; + u32 reg_value; +}; + struct mc13783_ts_priv { struct input_dev *idev; struct mc13xxx *mc13xxx; @@ -37,6 +44,7 @@ struct mc13783_ts_priv { unsigned int sample[4]; u8 ato; bool atox; + const struct mc13xxx_chip *chip; }; static irqreturn_t mc13783_ts_handler(int irq, void *data) @@ -93,6 +101,9 @@ static void mc13783_ts_report_sample(struct mc13783_ts_priv *priv) cr0 = (cr0 + cr1) / 2; + if (cr0 > priv->chip->max_resistance) + cr0 = 0; + if (!cr0 || !sample_tolerance || (x2 - x0 < sample_tolerance && y2 - y0 < sample_tolerance)) { @@ -102,14 +113,14 @@ static void mc13783_ts_report_sample(struct mc13783_ts_priv *priv) input_report_abs(idev, ABS_Y, y1); dev_dbg(&idev->dev, "report (%d, %d, %d)\n", - x1, y1, 0x1000 - cr0); + x1, y1, priv->chip->max_resistance - cr0); schedule_delayed_work(&priv->work, HZ / 50); } else { dev_dbg(&idev->dev, "report release\n"); } input_report_abs(idev, ABS_PRESSURE, - cr0 ? 0x1000 - cr0 : cr0); + cr0 ? priv->chip->max_resistance - cr0 : 0); input_report_key(idev, BTN_TOUCH, cr0); input_sync(idev); } else { @@ -146,7 +157,8 @@ static int mc13783_ts_open(struct input_dev *dev) goto out; ret = mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0, - MC13XXX_ADC0_TSMOD_MASK, MC13XXX_ADC0_TSMOD0); + priv->chip->reg_mask, + priv->chip->reg_value); if (ret) mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv); out: @@ -160,7 +172,7 @@ static void mc13783_ts_close(struct input_dev *dev) mc13xxx_lock(priv->mc13xxx); mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0, - MC13XXX_ADC0_TSMOD_MASK, 0); + priv->chip->reg_mask, 0); mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv); mc13xxx_unlock(priv->mc13xxx); @@ -172,6 +184,7 @@ 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; + const struct platform_device_id *id = platform_get_device_id(pdev); int ret = -ENOMEM; priv = kzalloc(sizeof(*priv), GFP_KERNEL); @@ -182,6 +195,7 @@ 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->chip = (void *)id->driver_data; if (pdata) { priv->atox = pdata->atox; @@ -228,7 +242,33 @@ static int mc13783_ts_remove(struct platform_device *pdev) return 0; } +static struct mc13xxx_chip mc13783_chip = { + .max_resistance = 4096, + .reg_mask = MC13XXX_ADC0_TSMOD_MASK, + .reg_value = MC13XXX_ADC0_TSMOD0, +}; + +static struct mc13xxx_chip mc34708_chip = { + .max_resistance = 4080, + .reg_mask = MC34708_ADC0_TSMASK, + .reg_value = MC34708_ADC0_TSPENDETEN, +}; + +static const struct platform_device_id mc13xxx_ts_idtable[] = { + { + .name = "mc13783-ts", + .driver_data = (kernel_ulong_t)&mc13783_chip, + }, { + .name = "mc34708-ts", + .driver_data = (kernel_ulong_t)&mc34708_chip, + }, { + /* sentinel */ + } +}; +MODULE_DEVICE_TABLE(platform, mc13xxx_ts_idtable); + static struct platform_driver mc13783_ts_driver = { + .id_table = mc13xxx_ts_idtable, .remove = mc13783_ts_remove, .driver = { .name = MC13783_TS_NAME,