From patchwork Fri Sep 13 07:52:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoniu Miclaus X-Patchwork-Id: 13803069 Received: from mx0b-00128a01.pphosted.com (mx0a-00128a01.pphosted.com [148.163.135.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC65B29A2; Fri, 13 Sep 2024 07:55:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.135.77 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726214150; cv=none; b=WfZXlwOm36IMUa9aNA8IBc6uKFxU0aJMy8wZkRQzvgJOfy+4dPnqq5JEWBJikoF1pDLMj5DjQ3uPtYetqGKIWaLrL4AGCaG7zOygNl41IeDDJGzzL00/+a5VXL94Js1dnJHM/SvlTLOGPLYfjfKJAxtFMgi2eDiPet54+7VrZYc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726214150; c=relaxed/simple; bh=hJf9Ys1YG+ZMdst/I33jqFnAlbkaksSFSliRW9NL8ew=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=minXt/tZbJqu3dhFQrOACeJFznnoltiAxfnreYU8b/VY5FJySh30C6nB6oSildk6aUh2wFzgaKJhaXhDdvttHpTrZ94NQoMNMm+2YUjlL1EcfEPITVcmgklcfhERyqkq5zZnW/mqX3ezbtAT8YrzOnEEXhsI74KEF4GFwnJA3UA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=analog.com; spf=pass smtp.mailfrom=analog.com; dkim=pass (2048-bit key) header.d=analog.com header.i=@analog.com header.b=OUBeBmSh; arc=none smtp.client-ip=148.163.135.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=analog.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=analog.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=analog.com header.i=@analog.com header.b="OUBeBmSh" Received: from pps.filterd (m0375855.ppops.net [127.0.0.1]) by mx0b-00128a01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48D45ngR010019; Fri, 13 Sep 2024 03:55:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.com; h= content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=DKIM; bh=IBqaE8N7QvuFOUx8HtZgxf+6wPi Z+MEl/NLbiYeErYg=; b=OUBeBmSh0AqRQmu1a1hNxPpzb0FSEIFwHEggkhRTdkg +Kwq4aj1HHpwhEiWkkBf9nJVCMMqnVWfVAcvk++eFSJXca3SW3lVQi7WE48jnp1Z SxlYLrJsgUXVWOvNLHO7+TZJKeFaWTjUp4KBb67vQX6/gfbYYA0VWWb8g7yv8H1F 2OFJrcP3XZcakhN0HIIUJv9Jy/s4IhuTK5nTn3QIfiGyLuJce3BeitxRJbdxcMrZ IeB+XuJQrMmxeGyvYCZE0ewHGIj1Sm5mx+b7Rd/zZjyB5D6GjfSkBRdNBqN5R1Bs Xv9Thmx+80MybmRCV2U8h5dPA7VPYlFpiAD7z7iDdGw== Received: from nwd2mta3.analog.com ([137.71.173.56]) by mx0b-00128a01.pphosted.com (PPS) with ESMTPS id 41kya1cm0u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Sep 2024 03:55:44 -0400 (EDT) Received: from ASHBMBX9.ad.analog.com (ASHBMBX9.ad.analog.com [10.64.17.10]) by nwd2mta3.analog.com (8.14.7/8.14.7) with ESMTP id 48D7thTi018968 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 13 Sep 2024 03:55:43 -0400 Received: from ASHBCASHYB5.ad.analog.com (10.64.17.133) by ASHBMBX9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.14; Fri, 13 Sep 2024 03:55:43 -0400 Received: from ASHBMBX9.ad.analog.com (10.64.17.10) by ASHBCASHYB5.ad.analog.com (10.64.17.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.14; Fri, 13 Sep 2024 03:55:43 -0400 Received: from zeus.spd.analog.com (10.66.68.11) by ashbmbx9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server id 15.2.986.14 via Frontend Transport; Fri, 13 Sep 2024 03:55:43 -0400 Received: from amiclaus-VirtualBox.ad.analog.com (AMICLAUS-L02.ad.analog.com [10.48.65.165]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 48D7tW6n015289; Fri, 13 Sep 2024 03:55:34 -0400 From: Antoniu Miclaus To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , "Mark Brown" , Antoniu Miclaus , , , , Subject: [PATCH v4 1/2] dt-bindings: touchscreen: add ad7877 support Date: Fri, 13 Sep 2024 10:52:29 +0300 Message-ID: <20240913075307.154435-1-antoniu.miclaus@analog.com> X-Mailer: git-send-email 2.46.0 Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ADIRuleOP-NewSCL: Rule Triggered X-Proofpoint-ORIG-GUID: s9XWRs5T7LUg_nM7hq48WGxmbdnIWctM X-Proofpoint-GUID: s9XWRs5T7LUg_nM7hq48WGxmbdnIWctM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 adultscore=0 bulkscore=1 priorityscore=1501 spamscore=0 malwarescore=0 mlxlogscore=999 phishscore=0 clxscore=1015 lowpriorityscore=1 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2408220000 definitions=main-2409130054 Add device tree bindings for ad7877. Signed-off-by: Antoniu Miclaus Reviewed-by: Krzysztof Kozlowski --- changes in v4: - add bindings patch first - update commit title/body based on review. - add units for pen-down-acc-interval property. - add default value for adi,acquisition-time-us and adi,vref-delay-us property .../input/touchscreen/adi,ad7877.yaml | 106 ++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/touchscreen/adi,ad7877.yaml diff --git a/Documentation/devicetree/bindings/input/touchscreen/adi,ad7877.yaml b/Documentation/devicetree/bindings/input/touchscreen/adi,ad7877.yaml new file mode 100644 index 000000000000..c472f50f7a59 --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen/adi,ad7877.yaml @@ -0,0 +1,106 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/touchscreen/adi,ad7877.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog Devices AD7877 Touch Screen Controller + +maintainers: + - Antoniu Miclaus + +description: | + Analog Devices Touch Screen Controller + https://www.analog.com/media/en/technical-documentation/data-sheets/AD7877.pdf + +allOf: + - $ref: touchscreen.yaml# + - $ref: /schemas/spi/spi-peripheral-props.yaml# + +properties: + compatible: + enum: + - adi,ad7877 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + spi-max-frequency: + description: AD7877 SPI bus clock frequency. + minimum: 10000 + maximum: 20000000 + + adi,stopacq-polarity: + description: The polarity of the signal applied to the STOPACQ pin. + $ref: /schemas/types.yaml#/definitions/string + enum: [low, high] + + adi,first-conv-delay-ns: + description: Delay in ns before the first conversion. + enum: [500, 128000, 1000000, 8000000] + + adi,pen-down-acc-interval-us: + description: Enable the ADC to repeatedly perform conversions. + enum: [0, 500, 1000, 8000] + default: 0 + + adi,acquisition-time-us: + description: Select acquisition times in us for the ADC. + enum: [2, 4, 8, 16] + default: 2 + + adi,vref-delay-us: + description: Delay required for the SPI transfers depending on the VREF used. + default: 100 + + touchscreen-average-samples: + enum: [1, 4, 8, 16] + + touchscreen-x-plate-ohms: + default: 400 + + touchscreen-min-x: true + touchscreen-min-y: true + touchscreen-size-x: true + touchscreen-size-y: true + touchscreen-max-pressure: true + +required: + - compatible + - reg + - interrupts + - touchscreen-average-samples + +additionalProperties: false + +examples: + - | + #include + spi { + #address-cells = <1>; + #size-cells = <0>; + + touchscreen@0 { + compatible = "adi,ad7877"; + reg = <0>; + spi-max-frequency = <20000000>; + interrupts = <21 IRQ_TYPE_EDGE_FALLING>; + interrupt-parent = <&gpio>; + adi,vref-delay-us = <100>; + adi,stopacq-polarity = "low"; + adi,first-conv-delay-ns = <500>; + adi,pen-down-acc-interval-us = <0>; + adi,acquisition-time-us = <2>; + touchscreen-average-samples = <16>; + touchscreen-x-plate-ohms = <400>; + touchscreen-min-x = <0>; + touchscreen-min-y = <0>; + touchscreen-size-x = <800>; + touchscreen-size-y = <480>; + touchscreen-max-pressure = <4095>; + }; + }; +... From patchwork Fri Sep 13 07:52:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoniu Miclaus X-Patchwork-Id: 13803070 Received: from mx0a-00128a01.pphosted.com (mx0a-00128a01.pphosted.com [148.163.135.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E48A218DF8B; Fri, 13 Sep 2024 07:56:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.135.77 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726214164; cv=none; b=RrrkfSUUX0nY8vZOOWBU7lZQHp10TmsKtKZu6ZKivNAmzm3TKcrcOMh7hWa1zXrH/kzchiakYUZmX9HCEtnfsFWjNcwzlFcRxtrZeyW7B9rNmTiE1ffI9KdFuWXlR0JKWTVJvEHyom+VnN6J0XBqhpQeNoZob3EFbJuM4AFYF8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726214164; c=relaxed/simple; bh=o0Oc8XUBmXwKZhRMuem5KwSroQWpsowTvZ0grevx8o0=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YSJSDY4kZvGCp3kO1IIYLkrcVfAjjZxD7SgsUddO/3e+15cZl7zCDYVL76AN8cxbcP9rnLJ/gFNe/bXYQJB6numfWC2bAJuYZX5kgDudyWQEMuQZIgLyIMgzxmxFFRChA2RjUn4V/cMrhijELXPF22UVqOkj2vX40H8JUA5Ut3w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=analog.com; spf=pass smtp.mailfrom=analog.com; dkim=pass (2048-bit key) header.d=analog.com header.i=@analog.com header.b=SLtWxTsV; arc=none smtp.client-ip=148.163.135.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=analog.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=analog.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=analog.com header.i=@analog.com header.b="SLtWxTsV" Received: from pps.filterd (m0167089.ppops.net [127.0.0.1]) by mx0a-00128a01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48D4blx4031903; Fri, 13 Sep 2024 03:55:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=analog.com; h= content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=DKIM; bh=JEHhJ /DtatWJGVaqaJTWbQu52Wv/GwiyVVJIxl13fys=; b=SLtWxTsVkXLpxDbgWTou8 Mvze4YMFGnYDgTCnkPG+njBf2XTrbtLnadTh0650lDve0/f0py4KD/KjEe+sxZgt +s+ONzkZdXMu992qyfu6ZPfl+uxrS+8eQdgbpFzKV9wbWMzUz2vD7APDeabNtteC egGKoMLbJVm3e5cRHwXmC8XkxTFeVIoVTumy5xBNqxwEdYklueGPK9ZZR10PYXDN GJozDrIGu+qyyJcTiLtEY+xT6AA1okDJdd9FXosZ2sq67nwPOOn/vZpl4orJSa1I 63CpKMZfZPh8iI7Jo1CKPup6JxIc2bgt+bBl9msBC8p8K5rdHqBoGRMkDCOL9hfw A== Received: from nwd2mta3.analog.com ([137.71.173.56]) by mx0a-00128a01.pphosted.com (PPS) with ESMTPS id 41gyh1r1qw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 13 Sep 2024 03:55:57 -0400 (EDT) Received: from ASHBMBX9.ad.analog.com (ASHBMBX9.ad.analog.com [10.64.17.10]) by nwd2mta3.analog.com (8.14.7/8.14.7) with ESMTP id 48D7tuAF018997 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 13 Sep 2024 03:55:56 -0400 Received: from ASHBMBX9.ad.analog.com (10.64.17.10) by ASHBMBX9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.14; Fri, 13 Sep 2024 03:55:56 -0400 Received: from zeus.spd.analog.com (10.66.68.11) by ashbmbx9.ad.analog.com (10.64.17.10) with Microsoft SMTP Server id 15.2.986.14 via Frontend Transport; Fri, 13 Sep 2024 03:55:56 -0400 Received: from amiclaus-VirtualBox.ad.analog.com (AMICLAUS-L02.ad.analog.com [10.48.65.165]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id 48D7tW6o015289; Fri, 13 Sep 2024 03:55:49 -0400 From: Antoniu Miclaus To: Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Michael Hennerich , Mark Brown , Antoniu Miclaus , , , , Subject: [PATCH v4 2/2] input: touchscreen: ad7877: add dt support Date: Fri, 13 Sep 2024 10:52:30 +0300 Message-ID: <20240913075307.154435-2-antoniu.miclaus@analog.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240913075307.154435-1-antoniu.miclaus@analog.com> References: <20240913075307.154435-1-antoniu.miclaus@analog.com> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ADIRuleOP-NewSCL: Rule Triggered X-Proofpoint-ORIG-GUID: q6Rl_DoRyqoduiO9ZSDKKxCOW9y6-YOk X-Proofpoint-GUID: q6Rl_DoRyqoduiO9ZSDKKxCOW9y6-YOk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 suspectscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2408220000 definitions=main-2409130054 Add devicetree support within the driver. Remove old platform data approach since it is no longer used. Add match table. Signed-off-by: Antoniu Miclaus --- changes in v4: - merge match table and dt support patches. - include mod_devicetable.h - update prop parsing based on the new changes in the bindings. drivers/input/touchscreen/ad7877.c | 176 ++++++++++++++++++++++++----- include/linux/spi/ad7877.h | 25 ---- 2 files changed, 145 insertions(+), 56 deletions(-) delete mode 100644 include/linux/spi/ad7877.h diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c index a0598e9c7aff..30c247ae59e5 100644 --- a/drivers/input/touchscreen/ad7877.c +++ b/drivers/input/touchscreen/ad7877.c @@ -25,11 +25,13 @@ #include #include #include +#include #include +#include #include +#include #include #include -#include #include #include @@ -174,6 +176,8 @@ struct ad7877 { u8 averaging; u8 pen_down_acc_interval; + struct touchscreen_properties prop; + struct spi_transfer xfer[AD7877_NR_SENSE + 2]; struct spi_message msg; @@ -353,8 +357,7 @@ static int ad7877_process_data(struct ad7877 *ts) if (!timer_pending(&ts->timer)) input_report_key(input_dev, BTN_TOUCH, 1); - input_report_abs(input_dev, ABS_X, x); - input_report_abs(input_dev, ABS_Y, y); + touchscreen_report_pos(input_dev, &ts->prop, x, y, false); input_report_abs(input_dev, ABS_PRESSURE, Rt); input_sync(input_dev); @@ -667,11 +670,136 @@ static void ad7877_setup_ts_def_msg(struct spi_device *spi, struct ad7877 *ts) } } +static int ad7877_parse_props(struct ad7877 *ts) +{ + struct device *dev = &ts->spi->dev; + u32 value, average; + int ret; + + ts->model = (uintptr_t)device_get_match_data(dev); + if (!ts->model) + ts->model = 7877; + + ret = device_property_match_string(dev, "adi,stopacq-polarity", "low"); + if (ret < 0) { + ret = device_property_match_string(dev, "adi,stopacq-polarity", "high"); + if (ret < 0) + ts->stopacq_polarity = 0; + ts->stopacq_polarity = 1; + } else { + ts->stopacq_polarity = 0; + } + + ret = device_property_read_u32(dev, "adi,first-conv-delay-ns", &value); + if (!ret) { + switch (value) { + case 500: + ts->first_conversion_delay = 0; + break; + case 128000: + ts->first_conversion_delay = 1; + break; + case 1000000: + ts->first_conversion_delay = 2; + break; + case 8000000: + ts->first_conversion_delay = 3; + break; + default: + return dev_err_probe(dev, -EINVAL, + "Invalid adi,first-conv-delay-ns value\n"); + } + } + + device_property_read_u32(dev, "adi,pen-down-acc-interval-us", + &value); + if (!ret) { + switch (value) { + case 0: + ts->acquisition_time = 0; + break; + case 500: + ts->acquisition_time = 1; + break; + case 1000: + ts->acquisition_time = 2; + break; + case 8000: + ts->acquisition_time = 3; + break; + default: + return dev_err_probe(dev, -EINVAL, + "Invalid adi,pen-down-acc-interval-us value\n"); + } + } + + ret = device_property_read_u32(dev, "adi,acquisition-time-us", &value); + if (!ret) { + switch (value) { + case 2: + ts->acquisition_time = 0; + break; + case 4: + ts->acquisition_time = 1; + break; + case 8: + ts->acquisition_time = 2; + break; + case 16: + ts->acquisition_time = 3; + break; + default: + return dev_err_probe(dev, -EINVAL, + "Invalid adi,first-conv-delay-ns value\n"); + } + } + + device_property_read_u32(dev, "adi,vref-delay-us", + &value); + if (!value) + ts->vref_delay_usecs = 100; + else + ts->vref_delay_usecs = (u16)value; + + device_property_read_u32(dev, "touchscreen-x-plate-ohms", &value); + if (value) + ts->x_plate_ohms = (u16)value; + else + ts->x_plate_ohms = 400; + + /* + * The property is parsed also in the touchscreen_parse_properties() + * but is required for the ad7877_process_data() so we need to store it. + */ + device_property_read_u32(dev, "touchscreen-max-pressure", &value); + ts->pressure_max = (u16)value; + + device_property_read_u32(dev, "touchscreen-average-samples", &average); + switch (average) { + case 1: + ts->averaging = 0; + break; + case 4: + ts->averaging = 1; + break; + case 8: + ts->averaging = 2; + break; + case 16: + ts->averaging = 3; + break; + default: + return dev_err_probe(dev, -EINVAL, + "touchscreen-average-samples must be 1, 4, 8, or 16\n"); + } + + return 0; +} + static int ad7877_probe(struct spi_device *spi) { struct ad7877 *ts; struct input_dev *input_dev; - struct ad7877_platform_data *pdata = dev_get_platdata(&spi->dev); int err; u16 verify; @@ -680,11 +808,6 @@ static int ad7877_probe(struct spi_device *spi) return -ENODEV; } - if (!pdata) { - dev_dbg(&spi->dev, "no platform data?\n"); - return -ENODEV; - } - /* don't exceed max specified SPI CLK frequency */ if (spi->max_speed_hz > MAX_SPI_FREQ_HZ) { dev_dbg(&spi->dev, "SPI CLK %d Hz?\n",spi->max_speed_hz); @@ -714,27 +837,22 @@ static int ad7877_probe(struct spi_device *spi) ts->spi = spi; ts->input = input_dev; + err = ad7877_parse_props(ts); + if (err) + return err; + timer_setup(&ts->timer, ad7877_timer, 0); mutex_init(&ts->mutex); spin_lock_init(&ts->lock); - ts->model = pdata->model ? : 7877; - ts->vref_delay_usecs = pdata->vref_delay_usecs ? : 100; - ts->x_plate_ohms = pdata->x_plate_ohms ? : 400; - ts->pressure_max = pdata->pressure_max ? : ~0; - - ts->stopacq_polarity = pdata->stopacq_polarity; - ts->first_conversion_delay = pdata->first_conversion_delay; - ts->acquisition_time = pdata->acquisition_time; - ts->averaging = pdata->averaging; - ts->pen_down_acc_interval = pdata->pen_down_acc_interval; - snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&spi->dev)); input_dev->name = "AD7877 Touchscreen"; input_dev->phys = ts->phys; input_dev->dev.parent = &spi->dev; + touchscreen_parse_properties(ts->input, false, &ts->prop); + __set_bit(EV_KEY, input_dev->evbit); __set_bit(BTN_TOUCH, input_dev->keybit); __set_bit(EV_ABS, input_dev->evbit); @@ -742,17 +860,6 @@ static int ad7877_probe(struct spi_device *spi) __set_bit(ABS_Y, input_dev->absbit); __set_bit(ABS_PRESSURE, input_dev->absbit); - input_set_abs_params(input_dev, ABS_X, - pdata->x_min ? : 0, - pdata->x_max ? : MAX_12BIT, - 0, 0); - input_set_abs_params(input_dev, ABS_Y, - pdata->y_min ? : 0, - pdata->y_max ? : MAX_12BIT, - 0, 0); - input_set_abs_params(input_dev, ABS_PRESSURE, - pdata->pressure_min, pdata->pressure_max, 0, 0); - ad7877_write(spi, AD7877_REG_SEQ1, AD7877_MM_SEQUENCE); verify = ad7877_read(spi, AD7877_REG_SEQ1); @@ -805,10 +912,17 @@ static int ad7877_resume(struct device *dev) static DEFINE_SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume); +static const struct of_device_id ad7877_of_match[] = { + { .compatible = "adi,ad7877", }, + { } +}; +MODULE_DEVICE_TABLE(of, ad7877_of_match); + static struct spi_driver ad7877_driver = { .driver = { .name = "ad7877", .dev_groups = ad7877_groups, + .of_match_table = ad7877_of_match, .pm = pm_sleep_ptr(&ad7877_pm), }, .probe = ad7877_probe, diff --git a/include/linux/spi/ad7877.h b/include/linux/spi/ad7877.h deleted file mode 100644 index b7be843c88e2..000000000000 --- a/include/linux/spi/ad7877.h +++ /dev/null @@ -1,25 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* linux/spi/ad7877.h */ - -/* Touchscreen characteristics vary between boards and models. The - * platform_data for the device's "struct device" holds this information. - * - * It's OK if the min/max values are zero. - */ -struct ad7877_platform_data { - u16 model; /* 7877 */ - u16 vref_delay_usecs; /* 0 for external vref; etc */ - u16 x_plate_ohms; - u16 y_plate_ohms; - - u16 x_min, x_max; - u16 y_min, y_max; - u16 pressure_min, pressure_max; - - u8 stopacq_polarity; /* 1 = Active HIGH, 0 = Active LOW */ - u8 first_conversion_delay; /* 0 = 0.5us, 1 = 128us, 2 = 1ms, 3 = 8ms */ - u8 acquisition_time; /* 0 = 2us, 1 = 4us, 2 = 8us, 3 = 16us */ - u8 averaging; /* 0 = 1, 1 = 4, 2 = 8, 3 = 16 */ - u8 pen_down_acc_interval; /* 0 = covert once, 1 = every 0.5 ms, - 2 = ever 1 ms, 3 = every 8 ms,*/ -};