From patchwork Sun Jan 24 03:42:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff LaBundy X-Patchwork-Id: 370039 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E3F9C433E0 for ; Sun, 24 Jan 2021 03:44:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1C0BB22D49 for ; Sun, 24 Jan 2021 03:44:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726408AbhAXDoz (ORCPT ); Sat, 23 Jan 2021 22:44:55 -0500 Received: from mail-eopbgr750071.outbound.protection.outlook.com ([40.107.75.71]:35295 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726288AbhAXDoy (ORCPT ); Sat, 23 Jan 2021 22:44:54 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FutQpBH1xUS2VYmGRB3G4wn7XPvMSyvbjKFy4mkd1mUt0c/0tWQwS+OYocexTCHbMTZpiQ37ieWSk28UvD9gycJd7CgGEe90kfSpRGyfoyAcpZXnOtg5/k2daAfA4oO3x1Ke8MxRjzGFhhOxpUuzXXWhmZ051bRhAYE9sPAqwHizwCOIs7/8c9FI4kQqycyp6OIEZ9u/nPJR1fIOcNq2dMxkochnHqkNSbFS68SonfGiE0cCNlmqYenXJrl1BuT5fCuO2KN4d5sgbUPliO/0TveO5bYV3n/KshRL18f3rLbtK1proO+DnFnRtaikxpnovGfJh0l+r0YUK+zkA9KBeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ByWvf/c6Q/IiPhIz+2kV/2HseAcaygeY/9npwYQVLkE=; b=HhGljOWOBHX6k0QRHh9BTw9AQXdecAoyLL7kmgyFayTXIMC2jwhwmi+jHacQldt8M6unxLolIfF4AiPMd4onQ2MlSWuxgERt4lrc80RSHFBGQ73OyamfpUEC/OMCXY3lnvwJ4GdaV5r52ioD1ZbS+EflE6Qs8c8XttIqz8TNoGE4A72Rw/C9SdzNzDWoSzDEdWzT7ZQ1r0NFCA9Ls54Ey9FF9XpUuiLEXevOusdv5XYO9jPAGc5vm1fEiWvjgQuUFI9VANyTR3jLWnujWe2Gp1IkUpVqsMheornwBLVEcOT1FWwsScg/5sfR8eykZAJrAb5uAa+2tv1jYsvTy08i9Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=labundy.com; dmarc=pass action=none header.from=labundy.com; dkim=pass header.d=labundy.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NETORG5796793.onmicrosoft.com; s=selector1-NETORG5796793-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ByWvf/c6Q/IiPhIz+2kV/2HseAcaygeY/9npwYQVLkE=; b=AyXYaOkhVzbnhX3ggE/OYdcWQdKqSEZIYzgNINWsEX8beZywpwDJDFmJT4Ip21e74xfff2sjRNvVXLPwnDZ6ol/lCVwhe30OBZUnb+OhmpxXJydIsJ2XufptKq6ePUDkJpKHFxGX0FUsXXX0qFJbZaliskZisrkQZWgd36iIAX8= Authentication-Results: gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=none action=none header.from=labundy.com; Received: from SN6PR08MB5517.namprd08.prod.outlook.com (2603:10b6:805:fb::32) by SA1PR08MB6992.namprd08.prod.outlook.com (2603:10b6:806:189::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.16; Sun, 24 Jan 2021 03:43:32 +0000 Received: from SN6PR08MB5517.namprd08.prod.outlook.com ([fe80::972:c257:aa68:9be0]) by SN6PR08MB5517.namprd08.prod.outlook.com ([fe80::972:c257:aa68:9be0%4]) with mapi id 15.20.3763.014; Sun, 24 Jan 2021 03:43:32 +0000 From: Jeff LaBundy To: dmitry.torokhov@gmail.com, robh+dt@kernel.org Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, Jeff LaBundy Subject: [PATCH v2 1/5] input: touchscreen: Move helper functions to core Date: Sat, 23 Jan 2021 21:42:52 -0600 Message-Id: <1611459776-23265-2-git-send-email-jeff@labundy.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1611459776-23265-1-git-send-email-jeff@labundy.com> References: <1611459776-23265-1-git-send-email-jeff@labundy.com> X-Originating-IP: [136.49.173.128] X-ClientProxiedBy: SA9PR10CA0014.namprd10.prod.outlook.com (2603:10b6:806:a7::19) To SN6PR08MB5517.namprd08.prod.outlook.com (2603:10b6:805:fb::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (136.49.173.128) by SA9PR10CA0014.namprd10.prod.outlook.com (2603:10b6:806:a7::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3784.12 via Frontend Transport; Sun, 24 Jan 2021 03:43:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 58e6f9ff-5ba9-4e3c-dc4c-08d8c01a389b X-MS-TrafficTypeDiagnostic: SA1PR08MB6992: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BC6sd0IDZrzEA2SEDH93kiXkjtUhISo1DoNIihhAf87rxNEWxTS1R9eWd57EPnUZZSpDHbarnCuu0SEfkVKoovGlopfFVrnuxMWEkeLEmnZQJVPyioiHwJAjagbqozZ7B4MVFlZ5IX+ffyTSvUunEaSlMOedijNOwBDe5YmyLOdLUVX4l6rDCWWIlofQr1tpQr2NlqJ+LVT6rwfHYM+1sSoGQhOUfCNhgD3qlufh/wO2gl3FUgKB7Som/A51bRL2dZlIHYjCsExpO04aA5XFW1yklVfRi8Uj12Nbfn6JfCjDltczSIjvbHv5TKZ6Jr52COVtqyrbUNuSKiochFi3ssF68RKNjxxxqdxY3zMOEVOfWuJsEdTByP21GTy2/xynqPbjOol5q7Olita1X124jFhUeAl19s7nRhCnRKdOu5aqXujyB54Z3Apf0funyeHiQL36/jBchpY3wqW08rZgsSXVm94qqD3XFf6DzOmlEpIynnx3OJtaWRZYvY0nz/p8rUq7Ai/xJkpB4zgG4s85eg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR08MB5517.namprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(376002)(396003)(136003)(39830400003)(346002)(52116002)(107886003)(5660300002)(66946007)(8676002)(6486002)(6506007)(66556008)(8936002)(36756003)(966005)(66476007)(86362001)(69590400011)(2616005)(83380400001)(4326008)(26005)(30864003)(16526019)(186003)(6512007)(6666004)(316002)(478600001)(2906002)(956004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 9j57j5IpA7ym5jyxkW7xpQ5Ep+IP70ddMEMNQkfowQ+nbg6O3UN6AvRn3idOPCJCYPQZCEmVSP+f/MjZoWT1dieCerRUYW2Pfh+TEnuzLDdUN3tpmaNFbyvTjGTNKx1P8cRZo+VmDyMjtY9ieaydd8351caVwSy6hmkY9ssqy2POoJk/rk6YrtMtl3SlnZ6HjgKAhgTY+Jt8vZJmWB0dUZJUAmxsCi9oTtklBk3bcihFp7U1DyEbyy44sPe1uLJWBt5svtGuxcMLUciwyVTQUNLUYi7Y+g6fAKcL+trm4gHps0ZbXpQcO3qa1RbM1nLY8ExhQCaa1rWX7zd6enzI7ZIEU3YMexQMkLnwADoKycfnhGfR5S2zWiJCLOz3M6qwXJ6B5QhAtjk+9ewKWfQXOD+FTEghwE2DTBv+Do6NlveYTLNSFKn+IzcZaNPIlJXmb5Py3z8+z56TBlZEqQBH9c5EuMTgEvd2ZgKFy/xK2Ep98wo9dDA767iSJUP+XOvrPvzyP3kxlHkPR9e19/aF+cstRHydxEsPD+H5Ftl64ETuqKbXx/xNzaLcYxLKXtKSoh1grZxEp2lovlpmNNCeatCSGGeeP0lo8jxzR97qkcjUFqU66MAM9PUojUfAh4LQmpob/YGWM0ZEKQBTu5RKSPhNsKJVQ3f3yheSpmisc/Rl1NOL+cy+QFBBLQ8l2Ky7qgLOpkuQc1z6cCUZeItHDuF7FCvn5rXWh0bU6yrQUKd2I6aX8ZwstRKIskpONus39eUIiRjy7juBYBt/904mUZwG4A1OuS2qSwQCecUWJAfxF0/ucahVAJ7cMSI6M6+ciC5f+8FUZvjBEsQAbaCKi+ojfbBC7a6Bi2YaNtTl28Vp9VuHe/h1SV4AlWnNyQlQa/UdZgMjCttTTGmYdoCo35QlKJbBROtFKS7HBgFHiOPBkVKlc2WIM8kHm6F97bCHzvj1ealZ6lgP20Sr6v3M63lUwQQ19B4l0G2Sfz/WEwl2mK7KMfImYhQ1INULnWG4 X-OriginatorOrg: labundy.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58e6f9ff-5ba9-4e3c-dc4c-08d8c01a389b X-MS-Exchange-CrossTenant-AuthSource: SN6PR08MB5517.namprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2021 03:43:32.6277 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 00b69d09-acab-4585-aca7-8fb7c6323e6f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: I7iFJJnSQrJjYhhuSAc9rcb1hswyVeBNNB2XZ/+EFuFcEK2bhQq+Wy5zu8jsRM35pMPVBGUzl83SMWvtGQE2IQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR08MB6992 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Some devices outside of drivers/input/touchscreen/ can still make use of the touchscreen helper functions. Therefore, it was agreed in [1] to move them outside of drivers/input/touchscreen/ so that other devices can call them without INPUT_TOUCHSCREEN being set. As part of this change, 'of' is dropped from the filename because the helpers no longer actually use OF. No changes are made to the file contents whatsoever. [1] https://patchwork.kernel.org/patch/11924029/ Signed-off-by: Jeff LaBundy --- Changes in v2: - Added this patch to the series drivers/input/Makefile | 1 + drivers/input/touchscreen.c | 206 +++++++++++++++++++++++++++++ drivers/input/touchscreen/Kconfig | 4 - drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/of_touchscreen.c | 206 ----------------------------- 5 files changed, 207 insertions(+), 211 deletions(-) create mode 100644 drivers/input/touchscreen.c delete mode 100644 drivers/input/touchscreen/of_touchscreen.c -- 2.7.4 diff --git a/drivers/input/Makefile b/drivers/input/Makefile index d8f5310..037cc59 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_INPUT) += input-core.o input-core-y := input.o input-compat.o input-mt.o input-poller.o ff-core.o +input-core-y += touchscreen.o obj-$(CONFIG_INPUT_FF_MEMLESS) += ff-memless.o obj-$(CONFIG_INPUT_SPARSEKMAP) += sparse-keymap.o diff --git a/drivers/input/touchscreen.c b/drivers/input/touchscreen.c new file mode 100644 index 0000000..97342e1 --- /dev/null +++ b/drivers/input/touchscreen.c @@ -0,0 +1,206 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Generic DT helper functions for touchscreen devices + * + * Copyright (c) 2014 Sebastian Reichel + */ + +#include +#include +#include +#include +#include + +static bool touchscreen_get_prop_u32(struct device *dev, + const char *property, + unsigned int default_value, + unsigned int *value) +{ + u32 val; + int error; + + error = device_property_read_u32(dev, property, &val); + if (error) { + *value = default_value; + return false; + } + + *value = val; + return true; +} + +static void touchscreen_set_params(struct input_dev *dev, + unsigned long axis, + int min, int max, int fuzz) +{ + struct input_absinfo *absinfo; + + if (!test_bit(axis, dev->absbit)) { + dev_warn(&dev->dev, + "DT specifies parameters but the axis %lu is not set up\n", + axis); + return; + } + + absinfo = &dev->absinfo[axis]; + absinfo->minimum = min; + absinfo->maximum = max; + absinfo->fuzz = fuzz; +} + +/** + * touchscreen_parse_properties - parse common touchscreen DT properties + * @input: input device that should be parsed + * @multitouch: specifies whether parsed properties should be applied to + * single-touch or multi-touch axes + * @prop: pointer to a struct touchscreen_properties into which to store + * axis swap and invert info for use with touchscreen_report_x_y(); + * or %NULL + * + * This function parses common DT properties for touchscreens and setups the + * input device accordingly. The function keeps previously set up default + * values if no value is specified via DT. + */ +void touchscreen_parse_properties(struct input_dev *input, bool multitouch, + struct touchscreen_properties *prop) +{ + struct device *dev = input->dev.parent; + struct input_absinfo *absinfo; + unsigned int axis, axis_x, axis_y; + unsigned int minimum, maximum, fuzz; + bool data_present; + + input_alloc_absinfo(input); + if (!input->absinfo) + return; + + axis_x = multitouch ? ABS_MT_POSITION_X : ABS_X; + axis_y = multitouch ? ABS_MT_POSITION_Y : ABS_Y; + + data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x", + input_abs_get_min(input, axis_x), + &minimum) | + touchscreen_get_prop_u32(dev, "touchscreen-size-x", + input_abs_get_max(input, + axis_x) + 1, + &maximum) | + touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x", + input_abs_get_fuzz(input, axis_x), + &fuzz); + if (data_present) + touchscreen_set_params(input, axis_x, minimum, maximum - 1, fuzz); + + data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y", + input_abs_get_min(input, axis_y), + &minimum) | + touchscreen_get_prop_u32(dev, "touchscreen-size-y", + input_abs_get_max(input, + axis_y) + 1, + &maximum) | + touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y", + input_abs_get_fuzz(input, axis_y), + &fuzz); + if (data_present) + touchscreen_set_params(input, axis_y, minimum, maximum - 1, fuzz); + + axis = multitouch ? ABS_MT_PRESSURE : ABS_PRESSURE; + data_present = touchscreen_get_prop_u32(dev, + "touchscreen-max-pressure", + input_abs_get_max(input, axis), + &maximum) | + touchscreen_get_prop_u32(dev, + "touchscreen-fuzz-pressure", + input_abs_get_fuzz(input, axis), + &fuzz); + if (data_present) + touchscreen_set_params(input, axis, 0, maximum, fuzz); + + if (!prop) + return; + + prop->max_x = input_abs_get_max(input, axis_x); + prop->max_y = input_abs_get_max(input, axis_y); + + prop->invert_x = + device_property_read_bool(dev, "touchscreen-inverted-x"); + if (prop->invert_x) { + absinfo = &input->absinfo[axis_x]; + absinfo->maximum -= absinfo->minimum; + absinfo->minimum = 0; + } + + prop->invert_y = + device_property_read_bool(dev, "touchscreen-inverted-y"); + if (prop->invert_y) { + absinfo = &input->absinfo[axis_y]; + absinfo->maximum -= absinfo->minimum; + absinfo->minimum = 0; + } + + prop->swap_x_y = + device_property_read_bool(dev, "touchscreen-swapped-x-y"); + if (prop->swap_x_y) + swap(input->absinfo[axis_x], input->absinfo[axis_y]); +} +EXPORT_SYMBOL(touchscreen_parse_properties); + +static void +touchscreen_apply_prop_to_x_y(const struct touchscreen_properties *prop, + unsigned int *x, unsigned int *y) +{ + if (prop->invert_x) + *x = prop->max_x - *x; + + if (prop->invert_y) + *y = prop->max_y - *y; + + if (prop->swap_x_y) + swap(*x, *y); +} + +/** + * touchscreen_set_mt_pos - Set input_mt_pos coordinates + * @pos: input_mt_pos to set coordinates of + * @prop: pointer to a struct touchscreen_properties + * @x: X coordinate to store in pos + * @y: Y coordinate to store in pos + * + * Adjust the passed in x and y values applying any axis inversion and + * swapping requested in the passed in touchscreen_properties and store + * the result in a struct input_mt_pos. + */ +void touchscreen_set_mt_pos(struct input_mt_pos *pos, + const struct touchscreen_properties *prop, + unsigned int x, unsigned int y) +{ + touchscreen_apply_prop_to_x_y(prop, &x, &y); + pos->x = x; + pos->y = y; +} +EXPORT_SYMBOL(touchscreen_set_mt_pos); + +/** + * touchscreen_report_pos - Report touchscreen coordinates + * @input: input_device to report coordinates for + * @prop: pointer to a struct touchscreen_properties + * @x: X coordinate to report + * @y: Y coordinate to report + * @multitouch: Report coordinates on single-touch or multi-touch axes + * + * Adjust the passed in x and y values applying any axis inversion and + * swapping requested in the passed in touchscreen_properties and then + * report the resulting coordinates on the input_dev's x and y axis. + */ +void touchscreen_report_pos(struct input_dev *input, + const struct touchscreen_properties *prop, + unsigned int x, unsigned int y, + bool multitouch) +{ + touchscreen_apply_prop_to_x_y(prop, &x, &y); + input_report_abs(input, multitouch ? ABS_MT_POSITION_X : ABS_X, x); + input_report_abs(input, multitouch ? ABS_MT_POSITION_Y : ABS_Y, y); +} +EXPORT_SYMBOL(touchscreen_report_pos); + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Device-tree helpers functions for touchscreen devices"); diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index f012fe7..4c33278 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -12,10 +12,6 @@ menuconfig INPUT_TOUCHSCREEN if INPUT_TOUCHSCREEN -config TOUCHSCREEN_PROPERTIES - def_tristate INPUT - depends on INPUT - config TOUCHSCREEN_88PM860X tristate "Marvell 88PM860x touchscreen" depends on MFD_88PM860X diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 6233541..80cd241 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -7,7 +7,6 @@ wm97xx-ts-y := wm97xx-core.o -obj-$(CONFIG_TOUCHSCREEN_PROPERTIES) += of_touchscreen.o obj-$(CONFIG_TOUCHSCREEN_88PM860X) += 88pm860x-ts.o obj-$(CONFIG_TOUCHSCREEN_AD7877) += ad7877.o obj-$(CONFIG_TOUCHSCREEN_AD7879) += ad7879.o diff --git a/drivers/input/touchscreen/of_touchscreen.c b/drivers/input/touchscreen/of_touchscreen.c deleted file mode 100644 index 97342e1..0000000 --- a/drivers/input/touchscreen/of_touchscreen.c +++ /dev/null @@ -1,206 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Generic DT helper functions for touchscreen devices - * - * Copyright (c) 2014 Sebastian Reichel - */ - -#include -#include -#include -#include -#include - -static bool touchscreen_get_prop_u32(struct device *dev, - const char *property, - unsigned int default_value, - unsigned int *value) -{ - u32 val; - int error; - - error = device_property_read_u32(dev, property, &val); - if (error) { - *value = default_value; - return false; - } - - *value = val; - return true; -} - -static void touchscreen_set_params(struct input_dev *dev, - unsigned long axis, - int min, int max, int fuzz) -{ - struct input_absinfo *absinfo; - - if (!test_bit(axis, dev->absbit)) { - dev_warn(&dev->dev, - "DT specifies parameters but the axis %lu is not set up\n", - axis); - return; - } - - absinfo = &dev->absinfo[axis]; - absinfo->minimum = min; - absinfo->maximum = max; - absinfo->fuzz = fuzz; -} - -/** - * touchscreen_parse_properties - parse common touchscreen DT properties - * @input: input device that should be parsed - * @multitouch: specifies whether parsed properties should be applied to - * single-touch or multi-touch axes - * @prop: pointer to a struct touchscreen_properties into which to store - * axis swap and invert info for use with touchscreen_report_x_y(); - * or %NULL - * - * This function parses common DT properties for touchscreens and setups the - * input device accordingly. The function keeps previously set up default - * values if no value is specified via DT. - */ -void touchscreen_parse_properties(struct input_dev *input, bool multitouch, - struct touchscreen_properties *prop) -{ - struct device *dev = input->dev.parent; - struct input_absinfo *absinfo; - unsigned int axis, axis_x, axis_y; - unsigned int minimum, maximum, fuzz; - bool data_present; - - input_alloc_absinfo(input); - if (!input->absinfo) - return; - - axis_x = multitouch ? ABS_MT_POSITION_X : ABS_X; - axis_y = multitouch ? ABS_MT_POSITION_Y : ABS_Y; - - data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-x", - input_abs_get_min(input, axis_x), - &minimum) | - touchscreen_get_prop_u32(dev, "touchscreen-size-x", - input_abs_get_max(input, - axis_x) + 1, - &maximum) | - touchscreen_get_prop_u32(dev, "touchscreen-fuzz-x", - input_abs_get_fuzz(input, axis_x), - &fuzz); - if (data_present) - touchscreen_set_params(input, axis_x, minimum, maximum - 1, fuzz); - - data_present = touchscreen_get_prop_u32(dev, "touchscreen-min-y", - input_abs_get_min(input, axis_y), - &minimum) | - touchscreen_get_prop_u32(dev, "touchscreen-size-y", - input_abs_get_max(input, - axis_y) + 1, - &maximum) | - touchscreen_get_prop_u32(dev, "touchscreen-fuzz-y", - input_abs_get_fuzz(input, axis_y), - &fuzz); - if (data_present) - touchscreen_set_params(input, axis_y, minimum, maximum - 1, fuzz); - - axis = multitouch ? ABS_MT_PRESSURE : ABS_PRESSURE; - data_present = touchscreen_get_prop_u32(dev, - "touchscreen-max-pressure", - input_abs_get_max(input, axis), - &maximum) | - touchscreen_get_prop_u32(dev, - "touchscreen-fuzz-pressure", - input_abs_get_fuzz(input, axis), - &fuzz); - if (data_present) - touchscreen_set_params(input, axis, 0, maximum, fuzz); - - if (!prop) - return; - - prop->max_x = input_abs_get_max(input, axis_x); - prop->max_y = input_abs_get_max(input, axis_y); - - prop->invert_x = - device_property_read_bool(dev, "touchscreen-inverted-x"); - if (prop->invert_x) { - absinfo = &input->absinfo[axis_x]; - absinfo->maximum -= absinfo->minimum; - absinfo->minimum = 0; - } - - prop->invert_y = - device_property_read_bool(dev, "touchscreen-inverted-y"); - if (prop->invert_y) { - absinfo = &input->absinfo[axis_y]; - absinfo->maximum -= absinfo->minimum; - absinfo->minimum = 0; - } - - prop->swap_x_y = - device_property_read_bool(dev, "touchscreen-swapped-x-y"); - if (prop->swap_x_y) - swap(input->absinfo[axis_x], input->absinfo[axis_y]); -} -EXPORT_SYMBOL(touchscreen_parse_properties); - -static void -touchscreen_apply_prop_to_x_y(const struct touchscreen_properties *prop, - unsigned int *x, unsigned int *y) -{ - if (prop->invert_x) - *x = prop->max_x - *x; - - if (prop->invert_y) - *y = prop->max_y - *y; - - if (prop->swap_x_y) - swap(*x, *y); -} - -/** - * touchscreen_set_mt_pos - Set input_mt_pos coordinates - * @pos: input_mt_pos to set coordinates of - * @prop: pointer to a struct touchscreen_properties - * @x: X coordinate to store in pos - * @y: Y coordinate to store in pos - * - * Adjust the passed in x and y values applying any axis inversion and - * swapping requested in the passed in touchscreen_properties and store - * the result in a struct input_mt_pos. - */ -void touchscreen_set_mt_pos(struct input_mt_pos *pos, - const struct touchscreen_properties *prop, - unsigned int x, unsigned int y) -{ - touchscreen_apply_prop_to_x_y(prop, &x, &y); - pos->x = x; - pos->y = y; -} -EXPORT_SYMBOL(touchscreen_set_mt_pos); - -/** - * touchscreen_report_pos - Report touchscreen coordinates - * @input: input_device to report coordinates for - * @prop: pointer to a struct touchscreen_properties - * @x: X coordinate to report - * @y: Y coordinate to report - * @multitouch: Report coordinates on single-touch or multi-touch axes - * - * Adjust the passed in x and y values applying any axis inversion and - * swapping requested in the passed in touchscreen_properties and then - * report the resulting coordinates on the input_dev's x and y axis. - */ -void touchscreen_report_pos(struct input_dev *input, - const struct touchscreen_properties *prop, - unsigned int x, unsigned int y, - bool multitouch) -{ - touchscreen_apply_prop_to_x_y(prop, &x, &y); - input_report_abs(input, multitouch ? ABS_MT_POSITION_X : ABS_X, x); - input_report_abs(input, multitouch ? ABS_MT_POSITION_Y : ABS_Y, y); -} -EXPORT_SYMBOL(touchscreen_report_pos); - -MODULE_LICENSE("GPL v2"); -MODULE_DESCRIPTION("Device-tree helpers functions for touchscreen devices"); From patchwork Sun Jan 24 03:42:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff LaBundy X-Patchwork-Id: 370038 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE5FDC433E0 for ; Sun, 24 Jan 2021 03:45:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A8F172256F for ; Sun, 24 Jan 2021 03:45:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726451AbhAXDpp (ORCPT ); Sat, 23 Jan 2021 22:45:45 -0500 Received: from mail-co1nam11on2077.outbound.protection.outlook.com ([40.107.220.77]:63072 "EHLO NAM11-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726414AbhAXDpj (ORCPT ); Sat, 23 Jan 2021 22:45:39 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P1mZRR1sY4JpIsQwZ0EylYfj3qMSrp4F8BL74G5nmgtXQUGQREYY07oUOhl+I7yzmzf1NoO2ujpKf/nWAm2mfUPJawZLl9jFS0NBlyjeAQrguAj1TKGd0hY1eqrZyziSwGGOCjJZOhWkk/exuvLRIuZiAiFqIrPgiKJdH1ikmJxKgVvZtCF/naVPIyMD72Mw1SrKka6pvJXrUCifGaMLKHH+ZXodUqb7OAp7vJi4jukf7r81DdDF3f+o6x1xQv7ZRJCf99VSvb8qdnmuOH4aNL7sZ8/v5p/8g1VHV2ukW2dztDm8J7et0pdaYfsbGUElyunhVHeQzpykl6eKXY3BFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tE2P+I/jYdMeCfYclOyPmMy0yG6858akH/HsK64OvaI=; b=hOgm6Eec4GxtSmlA/kNFmUhqVYnjRiDu+4Qrnknbz+f0Ftc49vlI8XawVbvyI49qowcRBzs1oyI8qdm1NcCEBdB2X95VgOPhex4TWw/BCJF9OBEUNnpq8P+jXfL/VYvdJ1BOOkgh7WUY2N3YQ4SbDVAR3z/2PpsnqKDSLEkq6lgyieiVkGmpIB2TGycv0mqUh7I5C9ephBUdPFL3NCA42i3riOUE9n7Ljy0UiNFYGgEuHgajTWcrR0YwAjHt+HfJmG5l38WO71OqrXkjGQrKF0bwJDOY33DpJ9M+szwkRryg5eoeS7x3lwkfniCIqwxFO703b61siayaXGBp3zCZ9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=labundy.com; dmarc=pass action=none header.from=labundy.com; dkim=pass header.d=labundy.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NETORG5796793.onmicrosoft.com; s=selector1-NETORG5796793-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tE2P+I/jYdMeCfYclOyPmMy0yG6858akH/HsK64OvaI=; b=QKEPmb7fxWcxr4pNqdL3e1EsBM7qh4vcX5bo0Zf0i4J+54DBuYFI53125ioubpIbbJ0HnRbuAcD2q//cRTdlMTyv8nJj1ZWY5Q/iCU7lqcjsKcsXhLpH4caRJeOFu7OsmVhZ8LXT32HCWMOA9Z8/NQlY9HCUB8XjT5Hi+2l83wc= Authentication-Results: gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=none action=none header.from=labundy.com; Received: from SN6PR08MB5517.namprd08.prod.outlook.com (2603:10b6:805:fb::32) by SA1PR08MB6992.namprd08.prod.outlook.com (2603:10b6:806:189::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.16; Sun, 24 Jan 2021 03:43:55 +0000 Received: from SN6PR08MB5517.namprd08.prod.outlook.com ([fe80::972:c257:aa68:9be0]) by SN6PR08MB5517.namprd08.prod.outlook.com ([fe80::972:c257:aa68:9be0%4]) with mapi id 15.20.3763.014; Sun, 24 Jan 2021 03:43:55 +0000 From: Jeff LaBundy To: dmitry.torokhov@gmail.com, robh+dt@kernel.org Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, Jeff LaBundy Subject: [PATCH v2 3/5] dt-bindings: input: touchscreen: Move helper bindings to core Date: Sat, 23 Jan 2021 21:42:54 -0600 Message-Id: <1611459776-23265-4-git-send-email-jeff@labundy.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1611459776-23265-1-git-send-email-jeff@labundy.com> References: <1611459776-23265-1-git-send-email-jeff@labundy.com> X-Originating-IP: [136.49.173.128] X-ClientProxiedBy: SA9PR10CA0014.namprd10.prod.outlook.com (2603:10b6:806:a7::19) To SN6PR08MB5517.namprd08.prod.outlook.com (2603:10b6:805:fb::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (136.49.173.128) by SA9PR10CA0014.namprd10.prod.outlook.com (2603:10b6:806:a7::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3784.12 via Frontend Transport; Sun, 24 Jan 2021 03:43:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8d58254a-6870-4d54-aad3-08d8c01a4648 X-MS-TrafficTypeDiagnostic: SA1PR08MB6992: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9QEY6f6Y32soL/6QcbiplJuq9na3Yyavv5xVvqTOEJL/WYZ4JzxU10FoM+0GrAXMQ7tvghv7Xibvjmbbs6Ftnwm9yfBMRVvSDyyKnK3KKwgolJ8BdC3YzqDn/SHMB89nrrfcPzO4gXRi5Z9mPbdCZCzeGQuZLpomo0aTcWvSiBsLnd9Ow85V3LaJSBy5ts6lG6YeBhI0pYdCpzLdYCqWq0+r4gAsmKfYkMUtInmr3vpvloEb+WWmkObM72Zb35D+HZUwd2V7A4yu6Em4oMCxF6F19vZeLbYGkDc6O9DvNe29RbUQPdDIpm0VvwMEBA6P1cBNn6aEqzNHi8m5KHWYWRbwrehpUQgdwradIAqXvbmBU+8N93gf6lhTVdks7P71X3ovoK/IFxUIPbutS4c+07cYuhY8wF4qMByTBH7eYP62ZKMn+/2MQpLjDR2tdeCBL+v/RbmePRKfIZGUkvQduERntun0rNAw9VE0vtWg/X5jEpgrtjiR4ObtJXRJzfp4m5w6asQONTJeQW9UbZQ0WQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR08MB5517.namprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(376002)(396003)(136003)(39830400003)(346002)(52116002)(107886003)(5660300002)(66946007)(8676002)(6486002)(6506007)(66556008)(8936002)(36756003)(966005)(66476007)(86362001)(69590400011)(2616005)(83380400001)(4326008)(26005)(30864003)(16526019)(186003)(6512007)(316002)(478600001)(2906002)(956004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: mI7kzAqaLGfsVeO1/5YYducbaHBWKQ9WTuiw73vD0aThhNJvDRkS7n/7b12kYvgzGt6gdRMrQ5+Xil+s1WGV/woIlQ6zSFHvnlMWpiP60xja7vbJjvQ6daWJGIYP/agMjuBX+kVr5Gihi5e6dVTEF30Yv2IJdBVoki8sJ7oTHWSzo8TEGwsN/baJQ8gecRUL8rAh9IQCaRhoyDSKnm9d2cDUhkzu7cMWbyDtbLDIiBnf/MJJiht8Lzfjiap6fIjlwdYJDv+lcUQefhDXNJswUjTFD5n8wJdeeaixssn7b/J4H8gzJ7kloBM+LWzEyr3iuQwCWKdb+l164Vl+tKpa8SuhjvYFCHtJY3ckbubhkD9XdywcAUuSwVvqN3TQy22fJ77buqOmONQVpbcKZwp+7jbb+WQZM0IaX0lTEnLOhXl6rqZoz1Q7/JLlhxkFUWM3feWqGnq+JpzP4To8QAFl588wNAbISX5akiTw173c0nRfQzEiTIWWxoGphEoRY3GJi+lWLBqRk64yBcdb7FQrRHsH03WE80Yq8eoECaHkTspnb+WsxRGoE87Od5Y/tWhgox2ZdRFYEktRzlKzyh6LQnZrQxodGNh45SwWYdWhIJ96/mNY8GRa0+xL3xcDPmgCBGnJVe3cRg5Me/+cEud1g7t5Q3Rz/NTu0CQy6PRxgCcoZOQlPFYt/kN/dwHW7bjyt5Fccxe+0c8g+rBsrwPkyprs2MnW0TRjnicYdzlXvXbyqNmopvVqY7MEZk7aZFxoyqXAd5gtkFCRYzJne2pa9jjN+PWm+f9QMsrr9cWVmtevYm7Sm1iBJJa9ojY86N9hh9fH/0mqPH8C4QaxAqZbYx9hSCHBg/MV8HXkGDHy8WGYHQveQ2LchqAm/2CxGLX5UDHUFDRrzAU2F9LHSgqDcjBe4M+IqAfEbjHWj5zP+b30MntUxPIktYmLCE+g2LCSyHvJW9q2dNZmGXYeKNGRqczc+b1JED6Cj+9DTPr7K3L3gIQLWJ6t3uYfz6lbUFhc X-OriginatorOrg: labundy.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d58254a-6870-4d54-aad3-08d8c01a4648 X-MS-Exchange-CrossTenant-AuthSource: SN6PR08MB5517.namprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2021 03:43:55.5097 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 00b69d09-acab-4585-aca7-8fb7c6323e6f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7VsO+x40WwPjLO2MzRevp8KVAf+jMpds051rjkjvup8hzI/RY0+e15sGXQRqWk8EjF+DO8zOOt16nfqTlAjlVg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR08MB6992 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org With the helper functions moving to /drivers/input/ following the discussion in [1], touchscreen.yaml and touchscreen.txt are moved one level up as well to maintain a consistent directory structure. No changes are made to either file except to update the $id field in touchscreen.yaml to reflect the new path. The handful of .yaml bindings that reference the original relative path are updated as well. Last but not least, the handful of .txt bindings that included an absolute path to touchscreen.txt are updated too. [1] https://patchwork.kernel.org/patch/11924029/ Signed-off-by: Jeff LaBundy --- Changes in v2: - Added this patch to the series .../devicetree/bindings/input/elan_i2c.txt | 2 +- .../devicetree/bindings/input/touchscreen.txt | 1 + .../devicetree/bindings/input/touchscreen.yaml | 83 ++++++++++++++++++++++ .../bindings/input/touchscreen/ads7846.txt | 2 +- .../bindings/input/touchscreen/bu21013.txt | 2 +- .../input/touchscreen/cypress,cy8ctma140.yaml | 2 +- .../bindings/input/touchscreen/edt-ft5x06.yaml | 2 +- .../bindings/input/touchscreen/eeti,exc3000.yaml | 2 +- .../input/touchscreen/elan,elants_i2c.yaml | 2 +- .../bindings/input/touchscreen/goodix.yaml | 2 +- .../bindings/input/touchscreen/iqs5xx.txt | 2 +- .../bindings/input/touchscreen/mms114.txt | 2 +- .../bindings/input/touchscreen/touchscreen.txt | 1 - .../bindings/input/touchscreen/touchscreen.yaml | 83 ---------------------- 14 files changed, 94 insertions(+), 94 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/touchscreen.txt create mode 100644 Documentation/devicetree/bindings/input/touchscreen.yaml delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/touchscreen.yaml -- 2.7.4 diff --git a/Documentation/devicetree/bindings/input/elan_i2c.txt b/Documentation/devicetree/bindings/input/elan_i2c.txt index 9963247..f11c8e1 100644 --- a/Documentation/devicetree/bindings/input/elan_i2c.txt +++ b/Documentation/devicetree/bindings/input/elan_i2c.txt @@ -26,7 +26,7 @@ Optional properties: [0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt [1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt -[2]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt +[2]: Documentation/devicetree/bindings/input/touchscreen.txt Example: &i2c1 { diff --git a/Documentation/devicetree/bindings/input/touchscreen.txt b/Documentation/devicetree/bindings/input/touchscreen.txt new file mode 100644 index 0000000..e1adb90 --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen.txt @@ -0,0 +1 @@ +See touchscreen.yaml diff --git a/Documentation/devicetree/bindings/input/touchscreen.yaml b/Documentation/devicetree/bindings/input/touchscreen.yaml new file mode 100644 index 0000000..e2e27c3 --- /dev/null +++ b/Documentation/devicetree/bindings/input/touchscreen.yaml @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/touchscreen.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Common touchscreen Bindings + +maintainers: + - Dmitry Torokhov + +properties: + touchscreen-min-x: + description: minimum x coordinate reported + $ref: /schemas/types.yaml#/definitions/uint32 + default: 0 + + touchscreen-min-y: + description: minimum y coordinate reported + $ref: /schemas/types.yaml#/definitions/uint32 + default: 0 + + touchscreen-size-x: + description: horizontal resolution of touchscreen (maximum x coordinate reported + 1) + $ref: /schemas/types.yaml#/definitions/uint32 + + touchscreen-size-y: + description: vertical resolution of touchscreen (maximum y coordinate reported + 1) + $ref: /schemas/types.yaml#/definitions/uint32 + + touchscreen-max-pressure: + description: maximum reported pressure (arbitrary range dependent on the controller) + $ref: /schemas/types.yaml#/definitions/uint32 + + touchscreen-min-pressure: + description: minimum pressure on the touchscreen to be achieved in order + for the touchscreen driver to report a touch event. + $ref: /schemas/types.yaml#/definitions/uint32 + + touchscreen-fuzz-x: + description: horizontal noise value of the absolute input device (in pixels) + $ref: /schemas/types.yaml#/definitions/uint32 + + touchscreen-fuzz-y: + description: vertical noise value of the absolute input device (in pixels) + $ref: /schemas/types.yaml#/definitions/uint32 + + touchscreen-fuzz-pressure: + description: pressure noise value of the absolute input device (arbitrary + range dependent on the controller) + $ref: /schemas/types.yaml#/definitions/uint32 + + touchscreen-average-samples: + description: Number of data samples which are averaged for each read (valid + values dependent on the controller) + $ref: /schemas/types.yaml#/definitions/uint32 + + touchscreen-inverted-x: + description: X axis is inverted + type: boolean + + touchscreen-inverted-y: + description: Y axis is inverted + type: boolean + + touchscreen-swapped-x-y: + description: X and Y axis are swapped + Swapping is done after inverting the axis + type: boolean + + touchscreen-x-mm: + description: horizontal length in mm of the touchscreen + $ref: /schemas/types.yaml#/definitions/uint32 + + touchscreen-y-mm: + description: vertical length in mm of the touchscreen + $ref: /schemas/types.yaml#/definitions/uint32 + +dependencies: + touchscreen-size-x: [ touchscreen-size-y ] + touchscreen-size-y: [ touchscreen-size-x ] + touchscreen-x-mm: [ touchscreen-y-mm ] + touchscreen-y-mm: [ touchscreen-x-mm ] diff --git a/Documentation/devicetree/bindings/input/touchscreen/ads7846.txt b/Documentation/devicetree/bindings/input/touchscreen/ads7846.txt index 81f6bda..b158a86 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/ads7846.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/ads7846.txt @@ -69,7 +69,7 @@ Optional properties: touchscreen-swapped-x-y General touchscreen binding, see [1]. [1] All general touchscreen properties are described in - Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt. + Documentation/devicetree/bindings/input/touchscreen.txt. Deprecated properties: diff --git a/Documentation/devicetree/bindings/input/touchscreen/bu21013.txt b/Documentation/devicetree/bindings/input/touchscreen/bu21013.txt index da4c9d8..e056a5f 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/bu21013.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/bu21013.txt @@ -17,7 +17,7 @@ Optional properties: - touchscreen-swapped-x-y : General touchscreen binding, see [1]. [1] All general touchscreen properties are described in - Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt. + Documentation/devicetree/bindings/input/touchscreen.txt. Deprecated properties: - rohm,touch-max-x : Maximum outward permitted limit in the X axis diff --git a/Documentation/devicetree/bindings/input/touchscreen/cypress,cy8ctma140.yaml b/Documentation/devicetree/bindings/input/touchscreen/cypress,cy8ctma140.yaml index 3225c8d..900e112 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/cypress,cy8ctma140.yaml +++ b/Documentation/devicetree/bindings/input/touchscreen/cypress,cy8ctma140.yaml @@ -10,7 +10,7 @@ maintainers: - Linus Walleij allOf: - - $ref: touchscreen.yaml# + - $ref: ../touchscreen.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml b/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml index 4ce1094..3d73fe3 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml +++ b/Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml @@ -18,7 +18,7 @@ maintainers: - Dmitry Torokhov allOf: - - $ref: touchscreen.yaml# + - $ref: ../touchscreen.yaml# - if: properties: compatible: diff --git a/Documentation/devicetree/bindings/input/touchscreen/eeti,exc3000.yaml b/Documentation/devicetree/bindings/input/touchscreen/eeti,exc3000.yaml index 007adbc..b1beb61 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/eeti,exc3000.yaml +++ b/Documentation/devicetree/bindings/input/touchscreen/eeti,exc3000.yaml @@ -10,7 +10,7 @@ maintainers: - Dmitry Torokhov allOf: - - $ref: touchscreen.yaml# + - $ref: ../touchscreen.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml b/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml index a792d63..d3fabaf 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml +++ b/Documentation/devicetree/bindings/input/touchscreen/elan,elants_i2c.yaml @@ -10,7 +10,7 @@ maintainers: - David Heidelberg allOf: - - $ref: touchscreen.yaml# + - $ref: ../touchscreen.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/input/touchscreen/goodix.yaml b/Documentation/devicetree/bindings/input/touchscreen/goodix.yaml index da5b0d8..5bea19a 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/goodix.yaml +++ b/Documentation/devicetree/bindings/input/touchscreen/goodix.yaml @@ -10,7 +10,7 @@ maintainers: - Dmitry Torokhov allOf: - - $ref: touchscreen.yaml# + - $ref: ../touchscreen.yaml# properties: compatible: diff --git a/Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt b/Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt index efa0820..d9c107e 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt @@ -56,7 +56,7 @@ Optional properties: [0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt [1]: Documentation/devicetree/bindings/gpio/gpio.txt -[2]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt +[2]: Documentation/devicetree/bindings/input/touchscreen.txt Example: diff --git a/Documentation/devicetree/bindings/input/touchscreen/mms114.txt b/Documentation/devicetree/bindings/input/touchscreen/mms114.txt index 707234c..4c28a30 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/mms114.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/mms114.txt @@ -18,7 +18,7 @@ Optional properties: - touchscreen-inverted-y: See [1] - touchscreen-swapped-x-y: See [1] -[1]: Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt +[1]: Documentation/devicetree/bindings/input/touchscreen.txt Example: diff --git a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt deleted file mode 100644 index e1adb90..0000000 --- a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt +++ /dev/null @@ -1 +0,0 @@ -See touchscreen.yaml diff --git a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.yaml b/Documentation/devicetree/bindings/input/touchscreen/touchscreen.yaml deleted file mode 100644 index 36dc7b5..0000000 --- a/Documentation/devicetree/bindings/input/touchscreen/touchscreen.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/input/touchscreen/touchscreen.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Common touchscreen Bindings - -maintainers: - - Dmitry Torokhov - -properties: - touchscreen-min-x: - description: minimum x coordinate reported - $ref: /schemas/types.yaml#/definitions/uint32 - default: 0 - - touchscreen-min-y: - description: minimum y coordinate reported - $ref: /schemas/types.yaml#/definitions/uint32 - default: 0 - - touchscreen-size-x: - description: horizontal resolution of touchscreen (maximum x coordinate reported + 1) - $ref: /schemas/types.yaml#/definitions/uint32 - - touchscreen-size-y: - description: vertical resolution of touchscreen (maximum y coordinate reported + 1) - $ref: /schemas/types.yaml#/definitions/uint32 - - touchscreen-max-pressure: - description: maximum reported pressure (arbitrary range dependent on the controller) - $ref: /schemas/types.yaml#/definitions/uint32 - - touchscreen-min-pressure: - description: minimum pressure on the touchscreen to be achieved in order - for the touchscreen driver to report a touch event. - $ref: /schemas/types.yaml#/definitions/uint32 - - touchscreen-fuzz-x: - description: horizontal noise value of the absolute input device (in pixels) - $ref: /schemas/types.yaml#/definitions/uint32 - - touchscreen-fuzz-y: - description: vertical noise value of the absolute input device (in pixels) - $ref: /schemas/types.yaml#/definitions/uint32 - - touchscreen-fuzz-pressure: - description: pressure noise value of the absolute input device (arbitrary - range dependent on the controller) - $ref: /schemas/types.yaml#/definitions/uint32 - - touchscreen-average-samples: - description: Number of data samples which are averaged for each read (valid - values dependent on the controller) - $ref: /schemas/types.yaml#/definitions/uint32 - - touchscreen-inverted-x: - description: X axis is inverted - type: boolean - - touchscreen-inverted-y: - description: Y axis is inverted - type: boolean - - touchscreen-swapped-x-y: - description: X and Y axis are swapped - Swapping is done after inverting the axis - type: boolean - - touchscreen-x-mm: - description: horizontal length in mm of the touchscreen - $ref: /schemas/types.yaml#/definitions/uint32 - - touchscreen-y-mm: - description: vertical length in mm of the touchscreen - $ref: /schemas/types.yaml#/definitions/uint32 - -dependencies: - touchscreen-size-x: [ touchscreen-size-y ] - touchscreen-size-y: [ touchscreen-size-x ] - touchscreen-x-mm: [ touchscreen-y-mm ] - touchscreen-y-mm: [ touchscreen-x-mm ] From patchwork Sun Jan 24 03:42:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff LaBundy X-Patchwork-Id: 370037 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AD6F4C433DB for ; Sun, 24 Jan 2021 03:46:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 855732256F for ; Sun, 24 Jan 2021 03:46:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726475AbhAXDqD (ORCPT ); Sat, 23 Jan 2021 22:46:03 -0500 Received: from mail-eopbgr750071.outbound.protection.outlook.com ([40.107.75.71]:35295 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726223AbhAXDqB (ORCPT ); Sat, 23 Jan 2021 22:46:01 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JQI0JLdRVHXojNFDhy8i7EH3DocgfIICmNvrHYJPPQDHJ1lX5cJ6YTwadpXP/xj0QiT8+ZppSXOqBEZ2lctT9GXJZI8vhtP3mZ+woD8KOii73CuQ8U6y2omVvphM+8VWZDeAETBtOM1fIMoUcB3Wr/J+77zXu1QjHUo+OD2xUjBhmiJMVcK0odH/ly2/PfvAuXrNFbjo99/ke0s8gekd0iyXKs3FZ3AR/UGy03kPr9WroJfAhwS0Mt2xR5i1IT70qmOJryUFj7/L9L2nFVB1Zy707RtCzp0alQ4c9U5z7dz89Fy2+iIHl4+vyoDORaRYIdvfRFRogum3hJqN0RYhIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TT8oEZn3mMHqDkc8Zysyul/5tsGGsrhh4WeqHHSjm+0=; b=XKrR/FHfMvo7J9p26uNkQbXqM7ZdP2QSZEMs9uYlroaifWgS8IBwMLxv4+r2zknBAqub3tHaQRhBt0SYGyJD78Iw9+GlnVcTwh0SaUL0M1DNHHy5DILYf7igrkpXwDG3qXmRMoZ3zzqPsU0yS4Kbdu4MglwFNsmBSNCFHlFhdzwDFXJT9c3SM4xPjKdDKNfzbporIQS95DwxOAeZKGE9YlXPE6wEj/6r7rEPrWVAt78KCMs+dtYCtXy/AUfDsaDL940yjftrDUFkaN5grsqnajozP3E1j2CPmc1tu8X1kXWlwShPB1z5WMoKZQilopav+3X8OoKKrk+xhdrG+gpi8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=labundy.com; dmarc=pass action=none header.from=labundy.com; dkim=pass header.d=labundy.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NETORG5796793.onmicrosoft.com; s=selector1-NETORG5796793-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TT8oEZn3mMHqDkc8Zysyul/5tsGGsrhh4WeqHHSjm+0=; b=YxNhv+K5KJCqd797yBpcJEcBUeX/Km+P+8sOYkJH3squkPWdnwt4C2ULzRYHt7S1jMPRw6fzHofni52K7k4ja9OenZgndurn55shcnE1u1GycAfD3fMLT3lJH+3MAJhFDnwPIgMQ+rusadTN5HnhodAaWXJX1vHEHxnmunOMX38= Authentication-Results: gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=none action=none header.from=labundy.com; Received: from SN6PR08MB5517.namprd08.prod.outlook.com (2603:10b6:805:fb::32) by SA1PR08MB6992.namprd08.prod.outlook.com (2603:10b6:806:189::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.16; Sun, 24 Jan 2021 03:44:07 +0000 Received: from SN6PR08MB5517.namprd08.prod.outlook.com ([fe80::972:c257:aa68:9be0]) by SN6PR08MB5517.namprd08.prod.outlook.com ([fe80::972:c257:aa68:9be0%4]) with mapi id 15.20.3763.014; Sun, 24 Jan 2021 03:44:07 +0000 From: Jeff LaBundy To: dmitry.torokhov@gmail.com, robh+dt@kernel.org Cc: linux-input@vger.kernel.org, devicetree@vger.kernel.org, Jeff LaBundy Subject: [PATCH v2 4/5] dt-bindings: input: Add bindings for Azoteq IQS626A Date: Sat, 23 Jan 2021 21:42:55 -0600 Message-Id: <1611459776-23265-5-git-send-email-jeff@labundy.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1611459776-23265-1-git-send-email-jeff@labundy.com> References: <1611459776-23265-1-git-send-email-jeff@labundy.com> X-Originating-IP: [136.49.173.128] X-ClientProxiedBy: SA9PR10CA0014.namprd10.prod.outlook.com (2603:10b6:806:a7::19) To SN6PR08MB5517.namprd08.prod.outlook.com (2603:10b6:805:fb::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (136.49.173.128) by SA9PR10CA0014.namprd10.prod.outlook.com (2603:10b6:806:a7::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3784.12 via Frontend Transport; Sun, 24 Jan 2021 03:44:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2df2c91d-2ca4-4e5c-5af4-08d8c01a4d5a X-MS-TrafficTypeDiagnostic: SA1PR08MB6992: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yu4FRHEjCZzjtVGplRF86paoZq3gH3elj9EymsktxoqW1l3I2yg4rwLClSLjXzLSHnyFaLkTB/I62DMoBZnv+1q5F/mgxkgTtbsYjo9JY1RE/5/Z6h13YUCaZqplH1tZ6Ca4CQjlnTxXAmsne5TQyA0w22UBB03cCo9F80RAVHzeO4AiHuLY8iQuwZokH9a5EeBG9vCXZAKlFwtaWE8ar10Yc4L0QeiBBpcIT/mcgCNN5Q8R2FuC1nK8d9f9Yp+cNC+1v+WyVLmrnFXUEsuPkak/feX275VKH+K6k6vM7bFbm1BqHl2p6axh0tw5Vhuq5J/m/4u4S0JuC8tDQH5RrGhCosX5kjDJVyVQnkk3FvCdkPbALs3AidWXuWe4YrsXWopBRE4Q6UpQqQjgg5mW2/KEg7fdUzk4Fgrt6Ttl+bQXa5RKoVha2EwECjVVsPctE121+iAgdvvQpRE6Wa7ldqMaZRpTOZ6Qht1/Acsju0n+Gbxvo6O6Mcia4WpMfopd1ESbLl3piL8HYWKuJJmEew== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR08MB5517.namprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(376002)(396003)(136003)(39830400003)(346002)(52116002)(107886003)(5660300002)(66946007)(8676002)(6486002)(6506007)(66556008)(8936002)(36756003)(966005)(66476007)(86362001)(69590400011)(2616005)(83380400001)(4326008)(26005)(30864003)(16526019)(186003)(6512007)(6666004)(316002)(478600001)(2906002)(956004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: SWB8bMX0K64no/UvIKkXkQPxnGQ9fcRTYDA0SAA0ibPcajnwtnD3PO9WunH6x50mdrdyqFS1zlREAIJYuUSmHcaLdImcDqMlbnzoi+6Hc2S87IvN/sBabzXyMS0UDVnHUlOO3iGlAoyYv85yNFH0SkpkBYpCtqndfA5RZ0ji/lcWTf0LYjVVpcocJesILZARnE2oWayEyeTISCyxIXaYEc4pO5SCnVdji4lND1FGTGMLHl5W22UVxPr8eXc2/xfxrU6I71TenptSem0YD9F/sZaHAtQI9Izc3jU4K647sTm9MgRmigvMpXnVBGSwwMakLjn1yteXG9SETLUKwPbj9dhEWChamsgzTUNVuIBOR6gLCxJ4abGtbIH9zo7DYCTsi4eeOFEmeUmmTQgL3gEtVRcSzvNRqto2nTP/iP7FheAHv9LWOiKTXLu7HPFfAZ9Pck7CAu/ZVjH97gJh7CUBYBfS6iouQJcFb/2qdeN/Z4qaDIrN/gVS6QcJOcVkN5BBdtxyYQD7vrw8Nomw/bSdiH7VyfbEbuq8qp8YhCYkwdD4MoK45sAACY8q4O7mwjD/5THugiBwpiiAV9+vReSUuewIA223/cTLl5/VRtBa4eeRCqtJgg3cuP4jd/j1mflpdpWMigB938gmUQDpnuTbGq0IWKt99bh3oq+L2vzVFW2t+6cEK01HKm/tsXGLuaqAMeu6gm4ciC6nMjtLwD+qF/f6BRIGC+L3vZmHRA652vVON4SqSCQqpODziFoD3BlZixR7UqII4KCdLPhAl10ZR4L6ihb2trc4rvYNBXedIIsRP3ani8EgJr5Y5horb7X5ifl9Kfb+f1UJrCo0Y8b0ayCfADdbftAJKyUaHksRi22sq/7PMLG65AxGhBwgKB0liKFRcY/iEUPt2ytyNka8zYb/iWjmYZiq1+q0/yGO0jaZ7rmYeRscNxsuG/8KJqCHj/q0OiAlg98ucC+sTYATkqhxnwmOJ9FRkWzmaydouKDub7zWrZjo9jEotLDML3Bs X-OriginatorOrg: labundy.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2df2c91d-2ca4-4e5c-5af4-08d8c01a4d5a X-MS-Exchange-CrossTenant-AuthSource: SN6PR08MB5517.namprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2021 03:44:07.4416 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 00b69d09-acab-4585-aca7-8fb7c6323e6f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 0GFsFvIj9GLmTDujdzYEt6dwwu+sClxtkJkVLq9DovyhKvGC1BiF+vO3/yJ5WDghdyalBoIwwgTNjlNBgDPp7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR08MB6992 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This patch adds device tree bindings for the Azoteq IQS626A capacitive touch controller. Signed-off-by: Jeff LaBundy Reviewed-by: Rob Herring --- Changes in v2: - Added missing $ref to touchscreen.yaml .../devicetree/bindings/input/iqs626a.yaml | 843 +++++++++++++++++++++ 1 file changed, 843 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/iqs626a.yaml -- 2.7.4 diff --git a/Documentation/devicetree/bindings/input/iqs626a.yaml b/Documentation/devicetree/bindings/input/iqs626a.yaml new file mode 100644 index 0000000..679971e --- /dev/null +++ b/Documentation/devicetree/bindings/input/iqs626a.yaml @@ -0,0 +1,843 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/input/iqs626a.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Azoteq IQS626A Capacitive Touch Controller + +maintainers: + - Jeff LaBundy + +description: | + The Azoteq IQS626A is a 14-channel capacitive touch controller that features + additional Hall-effect and inductive sensing capabilities. + + Link to datasheet: https://www.azoteq.com/ + +allOf: + - $ref: touchscreen.yaml# + +properties: + compatible: + const: azoteq,iqs626a + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + azoteq,suspend-mode: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: | + Specifies the power mode during suspend as follows: + 0: Automatic (same as normal runtime, i.e. suspend/resume disabled) + 1: Low power (all sensing at a reduced reporting rate) + 2: Ultra-low power (ULP channel proximity sensing) + 3: Halt (no sensing) + + azoteq,clk-div: + type: boolean + description: Divides the device's core clock by a factor of 4. + + azoteq,ulp-enable: + type: boolean + description: + Permits the device to automatically enter ultra-low-power mode from low- + power mode. + + azoteq,ulp-update: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3, 4, 5, 6, 7] + default: 3 + description: | + Specifies the rate at which the trackpad, generic and Hall channels are + updated during ultra-low-power mode as follows: + 0: 8 + 1: 13 + 2: 28 + 3: 54 + 4: 89 + 5: 135 + 6: 190 + 7: 256 + + azoteq,ati-band-disable: + type: boolean + description: Disables the ATI band check. + + azoteq,ati-lp-only: + type: boolean + description: Limits automatic ATI to low-power mode. + + azoteq,gpio3-select: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3, 4, 5, 6, 7] + default: 1 + description: | + Selects the channel or group of channels for which the GPIO3 pin + represents touch state as follows: + 0: None + 1: ULP channel + 2: Trackpad + 3: Trackpad + 4: Generic channel 0 + 5: Generic channel 1 + 6: Generic channel 2 + 7: Hall channel + + azoteq,reseed-select: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: | + Specifies the event(s) that prompt the device to reseed (i.e. reset the + long-term average) of an associated channel as follows: + 0: None + 1: Proximity + 2: Proximity or touch + 3: Proximity, touch or deep touch + + azoteq,thresh-extend: + type: boolean + description: Multiplies all touch and deep-touch thresholds by 4. + + azoteq,tracking-enable: + type: boolean + description: + Enables all associated channels to track their respective reference + channels. + + azoteq,reseed-offset: + type: boolean + description: + Applies an 8-count offset to all long-term averages upon either ATI or + reseed events. + + azoteq,rate-np-ms: + minimum: 0 + maximum: 255 + default: 150 + description: Specifies the report rate (in ms) during normal-power mode. + + azoteq,rate-lp-ms: + minimum: 0 + maximum: 255 + default: 150 + description: Specifies the report rate (in ms) during low-power mode. + + azoteq,rate-ulp-ms: + multipleOf: 16 + minimum: 0 + maximum: 4080 + default: 0 + description: Specifies the report rate (in ms) during ultra-low-power mode. + + azoteq,timeout-pwr-ms: + multipleOf: 512 + minimum: 0 + maximum: 130560 + default: 2560 + description: + Specifies the length of time (in ms) to wait for an event before moving + from normal-power mode to low-power mode, or (if 'azoteq,ulp-enable' is + present) from low-power mode to ultra-low-power mode. + + azoteq,timeout-lta-ms: + multipleOf: 512 + minimum: 0 + maximum: 130560 + default: 40960 + description: + Specifies the length of time (in ms) to wait before resetting the long- + term average of all channels. Specify the maximum timeout to disable it + altogether. + + touchscreen-inverted-x: true + touchscreen-inverted-y: true + touchscreen-swapped-x-y: true + +patternProperties: + "^ulp-0|generic-[0-2]|hall$": + type: object + description: + Represents a single sensing channel. A channel is active if defined and + inactive otherwise. + + properties: + azoteq,ati-exclude: + type: boolean + description: + Prevents the channel from participating in an ATI event that is + manually triggered during initialization. + + azoteq,reseed-disable: + type: boolean + description: + Prevents the channel from being reseeded if the long-term average + timeout (defined in 'azoteq,timeout-lta') expires. + + azoteq,meas-cap-decrease: + type: boolean + description: + Decreases the internal measurement capacitance from 60 pF to 15 pF. + + azoteq,rx-inactive: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2] + default: 0 + description: | + Specifies how inactive CRX pins are to be terminated as follows: + 0: VSS + 1: Floating + 2: VREG (generic channels only) + + azoteq,linearize: + type: boolean + description: + Enables linearization of the channel's counts (generic and Hall + channels) or inverts the polarity of the channel's proximity or + touch states (ULP channel). + + azoteq,dual-direction: + type: boolean + description: + Specifies that the channel's long-term average is to freeze in the + presence of either increasing or decreasing counts, thereby permit- + ting events to be reported in either direction. + + azoteq,filt-disable: + type: boolean + description: Disables raw count filtering for the channel. + + azoteq,ati-mode: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + description: | + Specifies the channel's ATI mode as follows: + 0: Disabled + 1: Semi-partial + 2: Partial + 3: Full + + The default value is a function of the channel and the device's reset + user interface (RUI); reference the datasheet for further information + about the available RUI options. + + azoteq,ati-base: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [75, 100, 150, 200] + description: + Specifies the channel's ATI base. The default value is a function + of the channel and the device's RUI. + + azoteq,ati-target: + $ref: /schemas/types.yaml#/definitions/uint32 + multipleOf: 32 + minimum: 0 + maximum: 2016 + description: + Specifies the channel's ATI target. The default value is a function + of the channel and the device's RUI. + + azoteq,cct-increase: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 16 + default: 0 + description: + Specifies the degree to which the channel's charge cycle time is to + be increased, with 0 representing no increase. The maximum value is + limited to 4 in the case of the ULP channel, and the property is un- + available entirely in the case of the Hall channel. + + azoteq,proj-bias: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: | + Specifies the bias current applied during projected-capacitance + sensing as follows: + 0: 2.5 uA + 1: 5 uA + 2: 10 uA + 3: 20 uA + + This property is unavailable in the case of the Hall channel. + + azoteq,sense-freq: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + description: | + Specifies the channel's sensing frequency as follows (parenthesized + numbers represent the frequency if 'azoteq,clk-div' is present): + 0: 4 MHz (1 MHz) + 1: 2 MHz (500 kHz) + 2: 1 MHz (250 kHz) + 3: 500 kHz (125 kHz) + + This property is unavailable in the case of the Hall channel. The + default value is a function of the channel and the device's RUI. + + azoteq,ati-band-tighten: + type: boolean + description: + Tightens the ATI band from 1/8 to 1/16 of the desired target (ULP and + generic channels only). + + azoteq,proj-enable: + type: boolean + description: Enables projected-capacitance sensing (ULP channel only). + + azoteq,filt-str-np-cnt: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: + Specifies the raw count filter strength during normal-power mode (ULP + and generic channels only). + + azoteq,filt-str-lp-cnt: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: + Specifies the raw count filter strength during low-power mode (ULP and + generic channels only). + + azoteq,filt-str-np-lta: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: + Specifies the long-term average filter strength during normal-power + mode (ULP and generic channels only). + + azoteq,filt-str-lp-lta: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: + Specifies the long-term average filter strength during low-power mode + (ULP and generic channels only). + + azoteq,rx-enable: + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 1 + maxItems: 8 + items: + minimum: 0 + maximum: 7 + description: + Specifies the CRX pin(s) associated with the channel. + + This property is unavailable in the case of the Hall channel. The + default value is a function of the channel and the device's RUI. + + azoteq,tx-enable: + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 1 + maxItems: 8 + items: + minimum: 0 + maximum: 7 + description: + Specifies the TX pin(s) associated with the channel. + + This property is unavailable in the case of the Hall channel. The + default value is a function of the channel and the device's RUI. + + azoteq,local-cap-size: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3, 4] + default: 0 + description: | + Specifies the capacitance to be added to the channel as follows: + 0: 0 pF + 1: 0.5 pF + 2: 1.0 pF + 3: 1.5 pF + 4: 2.0 pF + + This property is unavailable in the case of the ULP or Hall channels. + + azoteq,sense-mode: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 8, 9, 12, 14, 15] + description: | + Specifies the channel's sensing mode as follows: + 0: Self capacitance + 1: Projected capacitance + 8: Self inductance + 9: Mutual inductance + 12: External + 14: Hall effect + 15: Temperature + + This property is unavailable in the case of the ULP or Hall channels. + The default value is a function of the channel and the device's RUI. + + azoteq,tx-freq: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: | + Specifies the inductive sensing excitation frequency as follows + (parenthesized numbers represent the frequency if 'azoteq,clk-div' + is present): + 0: 16 MHz (4 MHz) + 1: 8 MHz (2 MHz) + 2: 4 MHz (1 MHz) + 3: 2 MHz (500 kHz) + + This property is unavailable in the case of the ULP or Hall channels. + + azoteq,invert-enable: + type: boolean + description: + Inverts the polarity of the states reported for proximity, touch and + deep-touch events relative to their respective thresholds (generic + channels only). + + azoteq,comp-disable: + type: boolean + description: + Disables compensation for the channel (generic channels only). + + azoteq,static-enable: + type: boolean + description: + Enables the static front-end for the channel (generic channels only). + + azoteq,assoc-select: + $ref: /schemas/types.yaml#/definitions/string-array + minItems: 1 + maxItems: 6 + items: + enum: + - ulp-0 + - trackpad-3x2 + - trackpad-3x3 + - generic-0 + - generic-1 + - generic-2 + - hall + description: + Specifies the associated channels for which the channel serves as a + reference channel. By default, no channels are selected. This prop- + erty is only available for the generic channels. + + azoteq,assoc-weight: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 255 + default: 0 + description: + Specifies the channel's impact weight if it acts as an associated + channel (0 = 0% impact, 255 = 200% impact). This property is only + available for the generic channels. + + patternProperties: + "^event-(prox|touch|deep)(-alt)?$": + type: object + description: + Represents a proximity, touch or deep-touch event reported by the + channel in response to a decrease in counts. Node names suffixed with + '-alt' instead correspond to an increase in counts. + + By default, the long-term average tracks an increase in counts such + that only events corresponding to a decrease in counts are reported + (refer to the datasheet for more information). + + Specify 'azoteq,dual-direction' to freeze the long-term average when + the counts increase or decrease such that events of either direction + can be reported. Alternatively, specify 'azoteq,invert-enable' to in- + vert the polarity of the states reported by the channel. + + Complementary events (e.g. event-touch and event-touch-alt) can both + be present and specify different key or switch codes, but not differ- + ent thresholds or hysteresis (if applicable). + + Proximity events are unavailable in the case of the Hall channel, and + deep-touch events are only available for the generic channels. Unless + otherwise specified, default values are a function of the channel and + the device's RUI. + + properties: + azoteq,thresh: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 255 + description: Specifies the threshold for the event. + + azoteq,hyst: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 15 + description: + Specifies the hysteresis for the event (touch and deep-touch + events only). + + linux,code: + $ref: /schemas/types.yaml#/definitions/uint32 + description: Numeric key or switch code associated with the event. + + linux,input-type: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [1, 5] + description: + Specifies whether the event is to be interpreted as a key (1) or + a switch (5). By default, Hall-channel events are interpreted as + switches and all others are interpreted as keys. + + dependencies: + linux,input-type: ["linux,code"] + + additionalProperties: false + + dependencies: + azoteq,assoc-weight: ["azoteq,assoc-select"] + + additionalProperties: false + + "^trackpad-3x[2-3]$": + type: object + description: + Represents all channels associated with the trackpad. The channels are + collectively active if the trackpad is defined and inactive otherwise. + + properties: + azoteq,ati-exclude: + type: boolean + description: + Prevents the trackpad channels from participating in an ATI event + that is manually triggered during initialization. + + azoteq,reseed-disable: + type: boolean + description: + Prevents the trackpad channels from being reseeded if the long-term + average timeout (defined in 'azoteq,timeout-lta') expires. + + azoteq,meas-cap-decrease: + type: boolean + description: + Decreases the internal measurement capacitance from 60 pF to 15 pF. + + azoteq,rx-inactive: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1] + default: 0 + description: | + Specifies how inactive CRX pins are to be terminated as follows: + 0: VSS + 1: Floating + + azoteq,linearize: + type: boolean + description: Inverts the polarity of the trackpad's touch state. + + azoteq,dual-direction: + type: boolean + description: + Specifies that the trackpad's long-term averages are to freeze in + the presence of either increasing or decreasing counts, thereby + permitting events to be reported in either direction. + + azoteq,filt-disable: + type: boolean + description: Disables raw count filtering for the trackpad channels. + + azoteq,ati-mode: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: | + Specifies the trackpad's ATI mode as follows: + 0: Disabled + 1: Semi-partial + 2: Partial + 3: Full + + azoteq,ati-base: + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 6 + maxItems: 9 + items: + minimum: 45 + maximum: 300 + default: [45, 45, 45, 45, 45, 45, 45, 45, 45] + description: Specifies each individual trackpad channel's ATI base. + + azoteq,ati-target: + $ref: /schemas/types.yaml#/definitions/uint32 + multipleOf: 32 + minimum: 0 + maximum: 2016 + default: 0 + description: Specifies the trackpad's ATI target. + + azoteq,cct-increase: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 4 + default: 0 + description: + Specifies the degree to which the trackpad's charge cycle time is to + be increased, with 0 representing no increase. + + azoteq,proj-bias: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: | + Specifies the bias current applied during projected-capacitance + sensing as follows: + 0: 2.5 uA + 1: 5 uA + 2: 10 uA + 3: 20 uA + + azoteq,sense-freq: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: | + Specifies the trackpad's sensing frequency as follows (parenthesized + numbers represent the frequency if 'azoteq,clk-div' is present): + 0: 4 MHz (1 MHz) + 1: 2 MHz (500 kHz) + 2: 1 MHz (250 kHz) + 3: 500 kHz (125 kHz) + + azoteq,ati-band-tighten: + type: boolean + description: + Tightens the ATI band from 1/8 to 1/16 of the desired target. + + azoteq,thresh: + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 6 + maxItems: 9 + items: + minimum: 0 + maximum: 255 + default: [0, 0, 0, 0, 0, 0, 0, 0, 0] + description: + Specifies each individual trackpad channel's touch threshold. + + azoteq,hyst: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 15 + default: 0 + description: Specifies the trackpad's touch hysteresis. + + azoteq,lta-update: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3, 4, 5, 6, 7] + default: 0 + description: | + Specifies the update rate of the trackpad's long-term average during + ultra-low-power mode as follows: + 0: 2 + 1: 4 + 2: 8 + 3: 16 + 4: 32 + 5: 64 + 6: 128 + 7: 255 + + azoteq,filt-str-trackpad: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: Specifies the trackpad coordinate filter strength. + + azoteq,filt-str-np-cnt: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: + Specifies the raw count filter strength during normal-power mode. + + azoteq,filt-str-lp-cnt: + $ref: /schemas/types.yaml#/definitions/uint32 + enum: [0, 1, 2, 3] + default: 0 + description: + Specifies the raw count filter strength during low-power mode. + + linux,keycodes: + $ref: /schemas/types.yaml#/definitions/uint32-array + minItems: 1 + maxItems: 6 + description: | + Specifies the numeric keycodes associated with each available gesture + in the following order (enter 0 for unused gestures): + 0: Positive flick or swipe in X direction + 1: Negative flick or swipe in X direction + 2: Positive flick or swipe in Y direction + 3: Negative flick or swipe in Y direction + 4: Tap + 5: Hold + + azoteq,gesture-swipe: + type: boolean + description: + Directs the device to interpret axial gestures as a swipe (finger + remains on trackpad) instead of a flick (finger leaves trackpad). + + azoteq,timeout-tap-ms: + multipleOf: 16 + minimum: 0 + maximum: 4080 + default: 0 + description: + Specifies the length of time (in ms) within which a trackpad touch + must be released in order to be interpreted as a tap. + + azoteq,timeout-swipe-ms: + multipleOf: 16 + minimum: 0 + maximum: 4080 + default: 0 + description: + Specifies the length of time (in ms) within which an axial gesture + must be completed in order to be interpreted as a flick or swipe. + + azoteq,thresh-swipe: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 255 + default: 0 + description: + Specifies the number of points across which an axial gesture must + travel in order to be interpreted as a flick or swipe. + + dependencies: + azoteq,gesture-swipe: ["linux,keycodes"] + azoteq,timeout-tap-ms: ["linux,keycodes"] + azoteq,timeout-swipe-ms: ["linux,keycodes"] + azoteq,thresh-swipe: ["linux,keycodes"] + + additionalProperties: false + +required: + - compatible + - reg + - interrupts + - "#address-cells" + - "#size-cells" + +additionalProperties: false + +examples: + - | + #include + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + iqs626a@44 { + #address-cells = <1>; + #size-cells = <0>; + + compatible = "azoteq,iqs626a"; + reg = <0x44>; + interrupt-parent = <&gpio>; + interrupts = <17 IRQ_TYPE_LEVEL_LOW>; + + azoteq,rate-np-ms = <16>; + azoteq,rate-lp-ms = <160>; + + azoteq,timeout-pwr-ms = <2560>; + azoteq,timeout-lta-ms = <32768>; + + ulp-0 { + azoteq,meas-cap-decrease; + + azoteq,ati-base = <75>; + azoteq,ati-target = <1024>; + + azoteq,rx-enable = <2>, <3>, <4>, + <5>, <6>, <7>; + + event-prox { + linux,code = ; + }; + }; + + trackpad-3x3 { + azoteq,filt-str-np-cnt = <1>; + azoteq,filt-str-lp-cnt = <1>; + + azoteq,hyst = <4>; + azoteq,thresh = <35>, <40>, <40>, + <38>, <33>, <38>, + <35>, <35>, <35>; + + azoteq,ati-mode = <3>; + azoteq,ati-base = <195>, <195>, <195>, + <195>, <195>, <195>, + <195>, <195>, <195>; + azoteq,ati-target = <512>; + + azoteq,proj-bias = <1>; + azoteq,sense-freq = <2>; + + linux,keycodes = , + , + , + , + , + ; + + azoteq,gesture-swipe; + azoteq,timeout-swipe-ms = <800>; + azoteq,timeout-tap-ms = <400>; + azoteq,thresh-swipe = <40>; + }; + + /* + * Preserve the default register settings for + * the temperature-tracking channel leveraged + * by reset user interface (RUI) 1. + * + * Scalar properties (e.g. ATI mode) are left + * untouched by simply omitting them; boolean + * properties must be specified explicitly as + * needed. + */ + generic-2 { + azoteq,reseed-disable; + azoteq,meas-cap-decrease; + azoteq,dual-direction; + azoteq,comp-disable; + azoteq,static-enable; + }; + + hall { + azoteq,reseed-disable; + azoteq,meas-cap-decrease; + + event-touch { + linux,code = ; + }; + }; + }; + }; + +...