From patchwork Wed Aug 3 17:01:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Morgan X-Patchwork-Id: 595186 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 B2720C19F2C for ; Wed, 3 Aug 2022 17:01:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236532AbiHCRB6 (ORCPT ); Wed, 3 Aug 2022 13:01:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235430AbiHCRB5 (ORCPT ); Wed, 3 Aug 2022 13:01:57 -0400 Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ACE75070E; Wed, 3 Aug 2022 10:01:55 -0700 (PDT) Received: by mail-oi1-x234.google.com with SMTP id u9so20502363oiv.12; Wed, 03 Aug 2022 10:01:55 -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; bh=FmXpKV8L1ROy4Dh0Qt2TT7rzbx5rKU4HTkrXEsPEgGo=; b=XLv9GzLaso1z0kUpccYFo7qXgLFVwOwXORFMlFM/tMwCTXHHDy5IUMJyIhd+U311bX Xu3T0n7FNbhArU+b9IUDQvT3zg1kw1Tf8s58ZIef7Ycx014Z2cLID6VTSKVA3yXBJ689 PoSXxHKgTjHNHvTj4xcxZ8XTrenqKdHOqOR9t7en6e8UJQSQBamQN41otiSC4mN2Pirg SlR/aoMBvxHaqJnic3Nvj9uTo3JRCJpoTZrT8XxDGyLmk3kp1LNNyt0LohiCh2bnnpey 8cKaEfRwp63pMJtYvhHtRqSNwZSWIwk/LA6R31HOD/iTpLz1pZNTRcaKmY3Vbrome3uw UaUw== 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; bh=FmXpKV8L1ROy4Dh0Qt2TT7rzbx5rKU4HTkrXEsPEgGo=; b=Cfm861w6vscLUfHY8PrlWVMhjFEAwH1RrJ9jqdRNWS59iQxAfiSy7c2r6GXwpm4hk1 WGTroG/B5x2jC9+B9qokgYNcp+SyzOw/VgBbr0tTXRvDMcUBpKVfM2NrMExcLYEw3TBw vdbKso1dtFk4jVIe8agOOBHuUXEJDfXXRIQog31vW1dzOY9gEWVxQdMteBL8joyZEUIF 04XDkKWWslkPcrMWiZ0M0njLdt9yWL89nziOx13RouXIMTX2edF/lBiu0Xa/exWh3y/w jMyuo4nlQmWX4sADhJg9yazA4sLMF18Ca98iS3DauSYZNegnelr5aPSj0giPVeIJeIs2 ygvw== X-Gm-Message-State: ACgBeo3X12zNzwHQtc6ysO+3fAxtKeH6ls8UpV2cHcQ8bdDGcJWuDX4/ frMeEgbk/GQ1IGYLtYy4hIg5puf6S6k= X-Google-Smtp-Source: AA6agR6LzO51AVlHmiFmSB5U9pLWazAoyDWwcV6PcvhhhibQSKjkOsUSvjPRC6l0CRKIhXLF4DeHTQ== X-Received: by 2002:a05:6808:1708:b0:335:1b16:fb09 with SMTP id bc8-20020a056808170800b003351b16fb09mr2117431oib.7.1659546114135; Wed, 03 Aug 2022 10:01:54 -0700 (PDT) Received: from wintermute.localdomain (cpe-76-183-134-35.tx.res.rr.com. [76.183.134.35]) by smtp.gmail.com with ESMTPSA id q16-20020a05683033d000b0061c29a38b3bsm4088453ott.33.2022.08.03.10.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Aug 2022 10:01:53 -0700 (PDT) From: Chris Morgan To: linux-input@vger.kernel.org Cc: linux-iio@vger.kernel.org, dmitry.torokhov@gmail.com, contact@artur-rojek.eu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, jic23@kernel.org, paul@crapouillou.net, Chris Morgan , Maya Matuszczyk , Rob Herring Subject: [PATCH v9 1/3] dt-bindings: adc-joystick: add poll-interval Date: Wed, 3 Aug 2022 12:01:43 -0500 Message-Id: <20220803170145.16186-2-macroalpha82@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220803170145.16186-1-macroalpha82@gmail.com> References: <20220803170145.16186-1-macroalpha82@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Chris Morgan Add poll-interval support for the adc-joystick documentation. This is an optional value and if not provided the adc-joystick works as it does today (with buffers). If this value is provided, the adc-joystick driver is polled at the specified interval. The existing attribute of "poll-interval" was used instead of complying with property-units.yaml after discussion of the issue on the mailing list. Signed-off-by: Maya Matuszczyk Signed-off-by: Chris Morgan Reviewed-by: Rob Herring Acked-by: Artur Rojek --- Documentation/devicetree/bindings/input/adc-joystick.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/input/adc-joystick.yaml b/Documentation/devicetree/bindings/input/adc-joystick.yaml index 2ee04e03bc22..ab5caad055ea 100644 --- a/Documentation/devicetree/bindings/input/adc-joystick.yaml +++ b/Documentation/devicetree/bindings/input/adc-joystick.yaml @@ -14,6 +14,9 @@ description: > Bindings for joystick devices connected to ADC controllers supporting the Industrial I/O subsystem. +allOf: + - $ref: input.yaml# + properties: compatible: const: adc-joystick @@ -28,6 +31,8 @@ properties: https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/iio-consumer.yaml for details. + poll-interval: true + '#address-cells': const: 1 From patchwork Wed Aug 3 17:01:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Morgan X-Patchwork-Id: 595970 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 E88A8C25B08 for ; Wed, 3 Aug 2022 17:02:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234698AbiHCRCA (ORCPT ); Wed, 3 Aug 2022 13:02:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236647AbiHCRB7 (ORCPT ); Wed, 3 Aug 2022 13:01:59 -0400 Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EB5E4E862; Wed, 3 Aug 2022 10:01:56 -0700 (PDT) Received: by mail-oi1-x22a.google.com with SMTP id l188so20545408oia.4; Wed, 03 Aug 2022 10:01:56 -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; bh=qdcjs9XGhmK/cRJUiHaI67EDCLuIo42dxXhjz0b2c3g=; b=Tsh13Z6nOwC6FPfe5E1lBiXdo1sPtVWsSfmL+xvD/zJ4gfle+L6AtgMsgX0BGYtZ4f HDiq3ApBKmoHCfOBZ6/EMJssXfdW6tjdUENPtWU+wXOp6J2rnqR38F6KuaDkNslzvWYj v8+Zuf9EntYNU6uwj5UdSLezj6CvcWKIgvUztMT4CpixNES/4WEciaed20YOCEwva61g ldQ/4NB31jnUkQSrXZWOit7rGhRXGK5GHJZcnjtpT0N0GXroiIUwyLgjU9oSYmi+muA6 27sqDGTaPxQO+sQNg+unaZjs+OTIGbOOVhKJfQvHgt4to14/JZ5bovLoJErchciXDbDh Llxg== 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; bh=qdcjs9XGhmK/cRJUiHaI67EDCLuIo42dxXhjz0b2c3g=; b=xutgeyWBJFhxmcgRrRwp4Lttu7ICcXSeEkigY0iz2et2C06s0rjAhXEaIvqw4w0fiy ztXKoUbhDueDVsTpspfMsXBbZSMluyHmicqVfluAfeAJEs1WXyKreYYnx5AnyhO5lHFC kl9/FCcx5NHbLWETf71po2u/9F9AhjLZ8gfgSO4iq5Dg5W/0p92f8+yoA7s9LPd2XbkL pjpTYH2vvwGbGghHJp+2H10P+JcdJK011CkWmF8qieDb84cmgI2dOSFBwouYIANesoOV 4gM7rbrE9Cdvkvg5GiIcjUwkBvKsZa1zSdRVIBgZF2ZpP6JETpROV9l8qDYVkWmXYejw gRWw== X-Gm-Message-State: ACgBeo3s9gv8WEgoyhdbk3Z3PzwmTKcf5vhkUVO8AkwNzY9IWKwFrtm/ 4uMhK4/c6AzkucKZckuqz+KuKfcclPU= X-Google-Smtp-Source: AA6agR5t50Xa3cfKhLqcDElVUOU0wCnVNI+7dY3NvVy6Oycl/i9IFOxW6fZCHI8oqe0C79tObNRK7w== X-Received: by 2002:a05:6808:2225:b0:341:408b:4a37 with SMTP id bd37-20020a056808222500b00341408b4a37mr2196521oib.29.1659546115554; Wed, 03 Aug 2022 10:01:55 -0700 (PDT) Received: from wintermute.localdomain (cpe-76-183-134-35.tx.res.rr.com. [76.183.134.35]) by smtp.gmail.com with ESMTPSA id q16-20020a05683033d000b0061c29a38b3bsm4088453ott.33.2022.08.03.10.01.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Aug 2022 10:01:54 -0700 (PDT) From: Chris Morgan To: linux-input@vger.kernel.org Cc: linux-iio@vger.kernel.org, dmitry.torokhov@gmail.com, contact@artur-rojek.eu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, jic23@kernel.org, paul@crapouillou.net, Chris Morgan , Maya Matuszczyk Subject: [PATCH v9 2/3] Input: adc-joystick - Add polled input device support Date: Wed, 3 Aug 2022 12:01:44 -0500 Message-Id: <20220803170145.16186-3-macroalpha82@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220803170145.16186-1-macroalpha82@gmail.com> References: <20220803170145.16186-1-macroalpha82@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Chris Morgan Add polled input device support to the adc-joystick driver. This is useful for devices which do not have hardware capable triggers on their SARADC. Code modified from adc-joystick.c changes made by Maya Matuszczyk. Signed-off-by: Maya Matuszczyk Signed-off-by: Chris Morgan --- drivers/input/joystick/adc-joystick.c | 69 +++++++++++++++++++++------ 1 file changed, 54 insertions(+), 15 deletions(-) diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joystick/adc-joystick.c index 78ebca7d400a..0a2c0fb73618 100644 --- a/drivers/input/joystick/adc-joystick.c +++ b/drivers/input/joystick/adc-joystick.c @@ -26,8 +26,23 @@ struct adc_joystick { struct adc_joystick_axis *axes; struct iio_channel *chans; int num_chans; + bool polled; }; +static void adc_joystick_poll(struct input_dev *input) +{ + struct adc_joystick *joy = input_get_drvdata(input); + int i, val, ret; + + for (i = 0; i < joy->num_chans; i++) { + ret = iio_read_channel_raw(&joy->chans[i], &val); + if (ret < 0) + return; + input_report_abs(input, joy->axes[i].code, val); + } + input_sync(input); +} + static int adc_joystick_handle(const void *data, void *private) { struct adc_joystick *joy = private; @@ -179,6 +194,7 @@ static int adc_joystick_probe(struct platform_device *pdev) int error; int bits; int i; + unsigned int poll_interval; joy = devm_kzalloc(dev, sizeof(*joy), GFP_KERNEL); if (!joy) @@ -192,14 +208,27 @@ static int adc_joystick_probe(struct platform_device *pdev) return error; } - /* Count how many channels we got. NULL terminated. */ + if (device_property_present(dev, "poll-interval")) { + error = device_property_read_u32(dev, "poll-interval", + &poll_interval); + if (error) + return error; + joy->polled = true; + } + + /* + * Count how many channels we got. NULL terminated. + * Do not check the storage size if using polling. + */ for (i = 0; joy->chans[i].indio_dev; i++) { bits = joy->chans[i].channel->scan_type.storagebits; - if (!bits || bits > 16) { - dev_err(dev, "Unsupported channel storage size\n"); + if (!joy->polled && (!bits || bits > 16)) { + dev_err(dev, + "Unsupported channel storage size\n"); return -EINVAL; } - if (bits != joy->chans[0].channel->scan_type.storagebits) { + if (!joy->polled && + bits != joy->chans[0].channel->scan_type.storagebits) { dev_err(dev, "Channels must have equal storage size\n"); return -EINVAL; } @@ -215,8 +244,14 @@ static int adc_joystick_probe(struct platform_device *pdev) joy->input = input; input->name = pdev->name; input->id.bustype = BUS_HOST; - input->open = adc_joystick_open; - input->close = adc_joystick_close; + + if (joy->polled) { + input_setup_polling(input, adc_joystick_poll); + input_set_poll_interval(input, poll_interval); + } else { + input->open = adc_joystick_open; + input->close = adc_joystick_close; + } error = adc_joystick_set_axes(dev, joy); if (error) @@ -229,16 +264,20 @@ static int adc_joystick_probe(struct platform_device *pdev) return error; } - joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy); - if (IS_ERR(joy->buffer)) { - dev_err(dev, "Unable to allocate callback buffer\n"); - return PTR_ERR(joy->buffer); - } + if (!joy->polled) { + joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, + joy); + if (IS_ERR(joy->buffer)) { + dev_err(dev, "Unable to allocate callback buffer\n"); + return PTR_ERR(joy->buffer); + } - error = devm_add_action_or_reset(dev, adc_joystick_cleanup, joy->buffer); - if (error) { - dev_err(dev, "Unable to add action\n"); - return error; + error = devm_add_action_or_reset(dev, adc_joystick_cleanup, + joy->buffer); + if (error) { + dev_err(dev, "Unable to add action\n"); + return error; + } } return 0; From patchwork Wed Aug 3 17:01:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Morgan X-Patchwork-Id: 595185 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 7E711C25B06 for ; Wed, 3 Aug 2022 17:02:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235430AbiHCRB7 (ORCPT ); Wed, 3 Aug 2022 13:01:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234698AbiHCRB6 (ORCPT ); Wed, 3 Aug 2022 13:01:58 -0400 Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 133C34C613; Wed, 3 Aug 2022 10:01:58 -0700 (PDT) Received: by mail-oi1-x22c.google.com with SMTP id h188so20157950oia.13; Wed, 03 Aug 2022 10:01:58 -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; bh=yrhBL50UTTJaHzMh461WNNj8NIR2DIRZ1vY8GGWYUG8=; b=aU3w8ALENo2xlgqpxs0x+l/rLIX910gH25zzMAzY2Prf0x4jaEGrahJxBiQD+fsmHc Wrdka6W/3Q0BLY/b3ox0wGlNQTfwpRTWdDC5ajmP5Bl2Bogb1bhWtj0mzPM2gW0cm4rh mFrQ1Rv/DeFaYUT45oJCKM+eVOfKPjNrixab9uD4fO/MpEtxJdG09jtFytRmU1+Yr36Q nx+b48Znv67ooJVLPQr/kcnYLIDDkFbc7DWSve4wfGeZ7tV8gYTHRZUOHVRuMiNQeIOs dE9dOztdM/L8c406umaLSeqFs15UGGHKc+0xwgZQ7k4v6TKHUqYMR52ogayEsHmAoVyg +2og== 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; bh=yrhBL50UTTJaHzMh461WNNj8NIR2DIRZ1vY8GGWYUG8=; b=A1yijy1aryrfwMgJeDtvprEJ+fB93k/IRsCQBwlVt0jRmNzL4cCXKEuQOyN6gsH/7G etbZ0In2AxAcqJV3RSGerQODKtya+hlJFlbHryIajBducM/umoAzEr1Xk7WvjNpwyONH oUlMEs3QasPF/zNtwLAOfja+mgt6ouxSo/OR1yelcaBdaJEEhbDifVWlL+5rY5/mQRT5 BDc/PLnqOIHtkkD5UOz4fVLTIZhsHKAin+9WvwZunic8LNXLIVfSEUMAFOMY6SdLD/BU 4Wunit5OmhXEt7a+XnlOYJECnUFmnuT3eN5EiH93VNhkluRecUqcn5AdC4seUV5Kfc9C M3Nw== X-Gm-Message-State: ACgBeo0hDX8gGQjz8+yQNW4rDwKtBoQ6xVFneaFeMtJUVX7Rg06omzDH wy7ECY2Wj+Ezh54WDxHU0aHEEUsMd1s= X-Google-Smtp-Source: AA6agR5XNmgDgiGwQCYn6097Bc5RezOQOHmDm972sQgHjxAhncQYYba15pE58ueR8Ed/GAxLB0JUSA== X-Received: by 2002:a05:6808:1391:b0:33a:a61a:bd1a with SMTP id c17-20020a056808139100b0033aa61abd1amr2122720oiw.169.1659546116930; Wed, 03 Aug 2022 10:01:56 -0700 (PDT) Received: from wintermute.localdomain (cpe-76-183-134-35.tx.res.rr.com. [76.183.134.35]) by smtp.gmail.com with ESMTPSA id q16-20020a05683033d000b0061c29a38b3bsm4088453ott.33.2022.08.03.10.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Aug 2022 10:01:56 -0700 (PDT) From: Chris Morgan To: linux-input@vger.kernel.org Cc: linux-iio@vger.kernel.org, dmitry.torokhov@gmail.com, contact@artur-rojek.eu, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, heiko@sntech.de, jic23@kernel.org, paul@crapouillou.net, Chris Morgan , Maya Matuszczyk Subject: [PATCH v9 3/3] arm64: dts: rockchip: Update joystick to polled for OG2 Date: Wed, 3 Aug 2022 12:01:45 -0500 Message-Id: <20220803170145.16186-4-macroalpha82@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220803170145.16186-1-macroalpha82@gmail.com> References: <20220803170145.16186-1-macroalpha82@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Chris Morgan Update the Odroid Go Advance to use "poll-interval" from the adc-joystick driver. Signed-off-by: Chris Morgan Signed-off-by: Maya Matuszczyk --- arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts index 415aa9ff8bd4..3389755dbdc8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts @@ -26,6 +26,7 @@ adc-joystick { compatible = "adc-joystick"; io-channels = <&saradc 1>, <&saradc 2>; + poll-interval = <60>; #address-cells = <1>; #size-cells = <0>;