From patchwork Mon Oct 31 19:01:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siarhei Volkau X-Patchwork-Id: 13026284 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C12EAFA3743 for ; Mon, 31 Oct 2022 19:02:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229876AbiJaTCh (ORCPT ); Mon, 31 Oct 2022 15:02:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbiJaTCf (ORCPT ); Mon, 31 Oct 2022 15:02:35 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1E0C6464; Mon, 31 Oct 2022 12:02:34 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id l32so7677351wms.2; Mon, 31 Oct 2022 12:02:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1oV8q4wH8HpohJNQjMdeR7O1zCaZlSwCcpOd8wfP+xo=; b=CkmNTdCg2hm0WKFji5qn+ppi0wBgT0tymI0lGqt8zxO/GV/swvpxIzhFKsUcN8OJ2F 7wWFzfaJnQK29Ob5JTj+SW+p4OELn3tpBiNM8QC2vl7xxs1SfHLQM3zKtItbYez7WAHM jMDmLDcK4NQVxdkXo/xk8yqqXxVqrIcaUaZxHAucpIu0BcQiqDHymdgZmEwOH+xrtbGn zyJ3ofscC5xzf5J4j4U9iFE1fyP5k6seTBkLqDtHpnLkyoI+C7yrqJGOAubKj/AT5CRv 32wvoqsJiEpCVKbiekhrxHdoTOP0utH48+xbnvJ/NPv/0TbsjWKwB/RJvWHpwv7OkJqw 7T4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1oV8q4wH8HpohJNQjMdeR7O1zCaZlSwCcpOd8wfP+xo=; b=lUHq6TyPV3Y8jV1nFEqGpv6JX6e+m2l5A34Y6PZuT2gSvEBLVGZiyhsJlZQhDxzbif 96y6imTc/o+smZYqOdYNlqvQKVV5eP9rjGFj2wmj1fJ6lAJ0ZX1p3ipnEolleOzxQT1Z If5VJ/keB+hFMxvryfJ9B5uTaWR8XuJc2VjyjbdQp5DI5d1DlcqyGtjoAj4TKsvJMaJS ZUFYJqqESDMWaRnMH1gN3zZPOyWSCmwLiggFldNtrnzG1b9mLOFWH3QT5JlD4ypkV39z enW4fB69ZMlz5+XsuXIr8EftTsm67GibkHmcicLN9niLNlnlxn2G5jDSbzZlFYh7Rf7z JWcw== X-Gm-Message-State: ACrzQf31UCKyO5QutNKTiO97tTg3WGgbFPX2HvpXE9KVNROdMi52xryE wGIDZC0uegPBarD/IgSOHP8= X-Google-Smtp-Source: AMsMyM6an+h8DT653j80VCIZ2lAUUYqeZ+j2b92KBjL0rtiB3+pJxS5ESw8vtrP0Fpf+THDLvEnZjA== X-Received: by 2002:a7b:c4cf:0:b0:3cf:497c:ae3a with SMTP id g15-20020a7bc4cf000000b003cf497cae3amr19112421wmk.177.1667242953401; Mon, 31 Oct 2022 12:02:33 -0700 (PDT) Received: from hp-power-15.localdomain (mm-167-8-212-37.vitebsk.dynamic.pppoe.byfly.by. [37.212.8.167]) by smtp.gmail.com with ESMTPSA id l13-20020a05600c2ccd00b003a2f2bb72d5sm9141750wmc.45.2022.10.31.12.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 12:02:32 -0700 (PDT) From: Siarhei Volkau Cc: Paul Cercueil , Siarhei Volkau , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Artur Rojek , linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 1/2] dt-bindings: adc-joystick: add valid-range Date: Mon, 31 Oct 2022 22:01:58 +0300 Message-Id: <20221031190159.1341027-2-lis8215@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221031190159.1341027-1-lis8215@gmail.com> References: <20221031190159.1341027-1-lis8215@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The valid-range property aims to cover detachable/lock-able joysticks where measured value goes outside valid-range. Signed-off-by: Siarhei Volkau --- .../bindings/input/adc-joystick.yaml | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/Documentation/devicetree/bindings/input/adc-joystick.yaml b/Documentation/devicetree/bindings/input/adc-joystick.yaml index da0f8dfca..0483f0afe 100644 --- a/Documentation/devicetree/bindings/input/adc-joystick.yaml +++ b/Documentation/devicetree/bindings/input/adc-joystick.yaml @@ -91,6 +91,20 @@ patternProperties: Omitting this property indicates the axis always returns to exactly the center position. + valid-range: + $ref: /schemas/types.yaml#/definitions/uint32-array + items: + - description: minimum value + - description: maximum value + description: > + Minimum and maximum values which are still valid for the axis. + If the value is outside the range an event won't emitted. + Shall fully cover the abs-range with some space added, + to take into account imprecise analog nature of the joystick. + When value goes out of valid range - corresponding axis is + centered. The center point calculated on abs-range basis. + This property is interpreted as two signed 32 bit values. + required: - reg - linux,code @@ -125,3 +139,51 @@ examples: abs-flat = <200>; }; }; + # A rather complex joystick hardware definition + # with two axes muxed into one ADC channel. + - | + #include + #include + #include + + gpio_mux: mux-controller { + compatible = "gpio-mux"; + #mux-control-cells = <0>; + + mux-gpios = <&gpe 2 GPIO_ACTIVE_HIGH>; + }; + + adcmux: adc-mux { + compatible = "io-channel-mux"; + io-channels = <&adc INGENIC_ADC_AUX>; + io-channel-names = "parent"; + #io-channel-cells = <1>; + + mux-controls = <&gpio_mux>; + + channels = "joystick-axis-x", "joystick-axis-y"; + }; + + joystick: joystick { + compatible = "adc-joystick"; + io-channels = <&adcmux 0>, <&adcmux 1>; + io-channel-names = "joystick-axis-x", "joystick-axis-y"; + #address-cells = <1>; + #size-cells = <0>; + + poll-interval = <16>; + + axis@0 { + reg = <0>; + linux,code = ; + abs-range = <3400 670>; + valid-range = <300 3700>; + }; + + axis@1 { + reg = <1>; + linux,code = ; + abs-range = <670 3400>; + valid-range = <300 3700>; + }; + }; From patchwork Mon Oct 31 19:01:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siarhei Volkau X-Patchwork-Id: 13026285 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9780FA3743 for ; Mon, 31 Oct 2022 19:02:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229955AbiJaTCk (ORCPT ); Mon, 31 Oct 2022 15:02:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229925AbiJaTCh (ORCPT ); Mon, 31 Oct 2022 15:02:37 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5E8C6464; Mon, 31 Oct 2022 12:02:36 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id l14so17317508wrw.2; Mon, 31 Oct 2022 12:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zavMHsSj3e/dCc/hkXC9bPGYtn7phryrRvHhVepuECA=; b=Go1kXz3Z1LNi9yomLF4YaQQGN0y/OKFhYwPQ5+Ef51gvcICz6enDy8oxYVs62pbLyx JLM6xCl3L4NsPrAEdJV9kjYPb/t9fZjlhhhXEVwK0OLkk7ovn7HJlgCjVvIU6IJAryKW EW3cvwQSjDVH6UcPVMkR+3So1Oef22dQW8OgXN/yqG12LiA6wVQELqB5/ff6sFuVlSu3 7UOrVeghwVnR+5KztQxsg4uyVavjCdtv0EeXZ/tT7sKySiIqQ3Lga8Z6B4UgN4RlTocL q5Ti0NxnQYPDb7qjgRnZxZ6DFK1Yh94EB1Rst2nEc+kvBxhn+xU+wLVMRfw69TWxcfSu tZ6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zavMHsSj3e/dCc/hkXC9bPGYtn7phryrRvHhVepuECA=; b=z6FEWoy28C8kwjzq5EIhWb4RLVR9qxQOBQQSwoEfQsIoCRYboJpJtchlClhxiV4KEo Pwzv8n9vpgzwVMKwJfZuzpxQgJrkFeedaAd6cx6O5WGVzzqHJBzN7QvmLlbcpZgePVPn Fufqgq4fJ6Q87x9rPSd2UEVHwzIIAIccyiIneszLXUO+dusIIrrwP5vS2cIYxVAcJenG UWVCB11izz9dYLV8zQoIFYsI0w4IFts7Ql5V8Ud5Y3iX4VuZZ75rnxa2wqMBeNSaPc66 8Bz/Um33oAVEcj+p2cPwRcs3MZDMz6Y/w4vDy5XsL/P/+Jc2IGpon2DsHPWxJaO8/jXQ 9tvw== X-Gm-Message-State: ACrzQf1kaRUW6bzmk+7MDz9Rj9+93FiftKPYlhVVnHT3wGDoEPK+o0vm ina4t6heNTHwVgd1qBXx75d5sRzQ2IyL/vTu X-Google-Smtp-Source: AMsMyM5lhnhuAEt9zL5fyRMdKem53TI6oRNzm9wxiTea3f3t0q+GWz/2qQf+R9GdX1tyWluwRcA36w== X-Received: by 2002:adf:a4cc:0:b0:235:f41c:aa1e with SMTP id h12-20020adfa4cc000000b00235f41caa1emr9271250wrb.515.1667242955237; Mon, 31 Oct 2022 12:02:35 -0700 (PDT) Received: from hp-power-15.localdomain (mm-167-8-212-37.vitebsk.dynamic.pppoe.byfly.by. [37.212.8.167]) by smtp.gmail.com with ESMTPSA id l13-20020a05600c2ccd00b003a2f2bb72d5sm9141750wmc.45.2022.10.31.12.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 12:02:34 -0700 (PDT) From: Siarhei Volkau Cc: Paul Cercueil , Siarhei Volkau , Dmitry Torokhov , Rob Herring , Krzysztof Kozlowski , Artur Rojek , linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/2] Input: adc-joystick - add detachable devices support Date: Mon, 31 Oct 2022 22:01:59 +0300 Message-Id: <20221031190159.1341027-3-lis8215@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221031190159.1341027-1-lis8215@gmail.com> References: <20221031190159.1341027-1-lis8215@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org For detachable or lock-able joysticks the ADC lanes might be biased to GND or AVDD when the joystick is detached/locked. One such kind of joystick is found in the Ritmix RZX-50 device. The joystick is non-detachable, although ADC lane biased to power supply when the "Hold" switch is activated. To avoid reporting old/broken measurements valid-range is used. When measured value is outside valid-range the driver reports safe center position for corresponding axis. Signed-off-by: Siarhei Volkau --- drivers/input/joystick/adc-joystick.c | 58 ++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joystick/adc-joystick.c index c0deff5d4..6a143dc38 100644 --- a/drivers/input/joystick/adc-joystick.c +++ b/drivers/input/joystick/adc-joystick.c @@ -18,6 +18,8 @@ struct adc_joystick_axis { s32 range[2]; s32 fuzz; s32 flat; + s32 valid[2]; + s32 center; }; struct adc_joystick { @@ -29,6 +31,14 @@ struct adc_joystick { bool polled; }; +static inline bool is_in_range(const s32 *range, int val) +{ + s32 min = range[0]; + s32 max = range[1]; + + return (min == 0 && max == 0) || (val >= min && val <= max); +} + static void adc_joystick_poll(struct input_dev *input) { struct adc_joystick *joy = input_get_drvdata(input); @@ -38,6 +48,10 @@ static void adc_joystick_poll(struct input_dev *input) ret = iio_read_channel_raw(&joy->chans[i], &val); if (ret < 0) return; + + if (!is_in_range(joy->axes[i].valid, val)) + val = joy->axes[i].center; + input_report_abs(input, joy->axes[i].code, val); } input_sync(input); @@ -86,6 +100,10 @@ static int adc_joystick_handle(const void *data, void *private) val = sign_extend32(val, msb); else val &= GENMASK(msb, 0); + + if (!is_in_range(joy->axes[i].valid, val)) + val = joy->axes[i].center; + input_report_abs(joy->input, joy->axes[i].code, val); } @@ -119,6 +137,21 @@ static void adc_joystick_cleanup(void *data) iio_channel_release_all_cb(data); } +static bool valid_range_covers_abs_range(struct adc_joystick_axis *axis) +{ + s32 abs_min, abs_max; + + if (axis->range[0] > axis->range[1]) { + abs_min = axis->range[1]; + abs_max = axis->range[0]; + } else { + abs_min = axis->range[0]; + abs_max = axis->range[1]; + } + + return axis->valid[0] <= abs_min && axis->valid[1] >= abs_max; +} + static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy) { struct adc_joystick_axis *axes; @@ -137,7 +170,7 @@ static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy) return -EINVAL; } - axes = devm_kmalloc_array(dev, num_axes, sizeof(*axes), GFP_KERNEL); + axes = devm_kcalloc(dev, num_axes, sizeof(*axes), GFP_KERNEL); if (!axes) return -ENOMEM; @@ -167,10 +200,33 @@ static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy) dev_err(dev, "abs-range invalid or missing\n"); goto err_fwnode_put; } + axes[i].center = (axes[i].range[0] + axes[i].range[1]) / 2; fwnode_property_read_u32(child, "abs-fuzz", &axes[i].fuzz); fwnode_property_read_u32(child, "abs-flat", &axes[i].flat); + if (fwnode_property_present(child, "valid-range")) { + error = fwnode_property_read_u32_array(child, + "valid-range", + axes[i].valid, 2); + if (error) { + dev_err(dev, "valid-range invalid\n"); + goto err_fwnode_put; + } + + if (axes[i].valid[0] > axes[i].valid[1]) { + dev_err(dev, + "valid-range invalid (min > max)\n"); + goto err_fwnode_put; + } + + if (!valid_range_covers_abs_range(&axes[i])) { + dev_err(dev, + "valid-range must cover abs-range\n"); + goto err_fwnode_put; + } + } + input_set_abs_params(joy->input, axes[i].code, axes[i].range[0], axes[i].range[1], axes[i].fuzz, axes[i].flat);