Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp2133478pxk; Sat, 5 Sep 2020 09:39:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6bD2pe3sJzKXMswG63DgJ85/uhyEaEXksefyogVTlW/U+zSHGlXRNYsRwu09Hag+1cdgU X-Received: by 2002:a17:906:7088:: with SMTP id b8mr12979829ejk.27.1599323969899; Sat, 05 Sep 2020 09:39:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599323969; cv=none; d=google.com; s=arc-20160816; b=Y4Kxrt+tc6IUrJN2X+v/EaIAYxXGv+I80N1e+wYslNICUu3zXlfLtDBdnRMzHfwK+p Fo/szxTCCgMbSTj5NmfCEiM6KJ4lT8pZVKH29Rvbx0qGKLSO5FUuHKB3bbwYuLD96jBT TczjthVLINSb/PtIE+Abroh6iBIz8Iez4meY1OB0duQT5eah+zfPczUNyVvNe0tfaq+S BJmRz+eAq78lWELdY4Q5YjYCvztAJBdYDT55TsmIwZEHnwUYc7/byw/3Rwxni+Lbrn8X gmRe+0Doo3qXjYjTjJivXZLDVATc1Ew1d1pZ2OEBtsomN3BERbTPDTyVh5COhyLrBidg Qtow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=R7rHFARqAEAQ82B37EGYcrw0HaXhhBvS9RsOmL7M7mk=; b=CrW5kQr7xFu2YZ8JGJZubFLlfNg1UjvfMWF9lkCmWcZKIW0e8iwF+GwDWUlEuFUKVd FSJkMY4YVBh9ldof5OhlmS29wlpBKp7mdTRl+xWCIW1+SXZPaXYRGOf1vCQDSttMjCb3 PiTGaWS/AIRrlhCuac3tJMfTSTiUIOVc01P5ajS+j41mfJqP6qTV5tCE3iouhPzEv8lJ kWIlUKOKpBhfAUZiCAm+WgKKBhtxAR85YkAPHsRWtD93vKBkkRzr5qwqDLC8eZh8S0a4 ibUN3xxH1KX+WdGnT7drCAN0/ujsRLfM/qihjp42snXMZVVUtasAa0dXC5JRS9EPIufN W/qg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k2si6288927eje.376.2020.09.05.09.39.05; Sat, 05 Sep 2020 09:39:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728378AbgIEQem (ORCPT + 99 others); Sat, 5 Sep 2020 12:34:42 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:55483 "EHLO relay9-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726568AbgIEQed (ORCPT ); Sat, 5 Sep 2020 12:34:33 -0400 X-Originating-IP: 195.189.32.242 Received: from pc.localdomain (unknown [195.189.32.242]) (Authenticated sender: contact@artur-rojek.eu) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 31630FF803; Sat, 5 Sep 2020 16:34:28 +0000 (UTC) From: Artur Rojek To: Dmitry Torokhov , Rob Herring , Mark Rutland , Jonathan Cameron , Paul Cercueil , Andy Shevchenko Cc: Heiko Stuebner , Ezequiel Garcia , linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Artur Rojek Subject: [PATCH v9 2/2] input: joystick: Add ADC attached joystick driver. Date: Sat, 5 Sep 2020 18:34:03 +0200 Message-Id: <20200905163403.64390-2-contact@artur-rojek.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200905163403.64390-1-contact@artur-rojek.eu> References: <20200905163403.64390-1-contact@artur-rojek.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a driver for joystick devices connected to ADC controllers supporting the Industrial I/O subsystem. Signed-off-by: Artur Rojek Tested-by: Paul Cercueil Tested-by: Heiko Stuebner --- Changes: v8: - respect scan index when reading channel data, - solve sparse warnings related to *_to_cpu calls, - simplify channel count logic, - drop the redundant comma from adc_joystick_of_match[] v9: - use `dev_err_probe`, - add missing CR to error messages, - remove unnecessary line breaks in `adc_joystick_set_axes`, - remove redundant error code print from `adc_joystick_probe`, - no need to pass `dev.parent` to `dev_err` in `adc_joystick_open`, - print error code in `adc_joystick_open` Notes: Dmitry, Jonathan, because of the above changes, I dropped your Acked-by. drivers/input/joystick/Kconfig | 10 ++ drivers/input/joystick/Makefile | 1 + drivers/input/joystick/adc-joystick.c | 249 ++++++++++++++++++++++++++ 3 files changed, 260 insertions(+) create mode 100644 drivers/input/joystick/adc-joystick.c diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig index eb031b7a4866..b080f0cfb068 100644 --- a/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig @@ -42,6 +42,16 @@ config JOYSTICK_A3D To compile this driver as a module, choose M here: the module will be called a3d. +config JOYSTICK_ADC + tristate "Simple joystick connected over ADC" + depends on IIO + select IIO_BUFFER_CB + help + Say Y here if you have a simple joystick connected over ADC. + + To compile this driver as a module, choose M here: the + module will be called adc-joystick. + config JOYSTICK_ADI tristate "Logitech ADI digital joysticks and gamepads" select GAMEPORT diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile index 8656023f6ef5..58232b3057d3 100644 --- a/drivers/input/joystick/Makefile +++ b/drivers/input/joystick/Makefile @@ -6,6 +6,7 @@ # Each configuration option enables a list of files. obj-$(CONFIG_JOYSTICK_A3D) += a3d.o +obj-$(CONFIG_JOYSTICK_ADC) += adc-joystick.o obj-$(CONFIG_JOYSTICK_ADI) += adi.o obj-$(CONFIG_JOYSTICK_AMIGA) += amijoy.o obj-$(CONFIG_JOYSTICK_AS5011) += as5011.o diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joystick/adc-joystick.c new file mode 100644 index 000000000000..e3ca15eed512 --- /dev/null +++ b/drivers/input/joystick/adc-joystick.c @@ -0,0 +1,249 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Input driver for joysticks connected over ADC. + * Copyright (c) 2019-2020 Artur Rojek + */ +#include +#include +#include +#include +#include +#include +#include + +struct adc_joystick_axis { + u32 code; + s32 range[2]; + s32 fuzz; + s32 flat; +}; + +struct adc_joystick { + struct input_dev *input; + struct iio_cb_buffer *buffer; + struct adc_joystick_axis *axes; + struct iio_channel *chans; + int num_chans; +}; + +static int adc_joystick_handle(const void *data, void *private) +{ + struct adc_joystick *joy = private; + enum iio_endian endianness; + int bytes, msb, val, idx, i; + bool sign; + + bytes = joy->chans[0].channel->scan_type.storagebits >> 3; + + for (i = 0; i < joy->num_chans; ++i) { + idx = joy->chans[i].channel->scan_index; + endianness = joy->chans[i].channel->scan_type.endianness; + msb = joy->chans[i].channel->scan_type.realbits - 1; + sign = (tolower(joy->chans[i].channel->scan_type.sign) == 's'); + + switch (bytes) { + case 1: + val = ((const u8 *)data)[idx]; + break; + case 2: + if (endianness == IIO_BE) + val = be16_to_cpu(((const __be16 *)data)[idx]); + else if (endianness == IIO_LE) + val = le16_to_cpu(((const __le16 *)data)[idx]); + else /* IIO_CPU */ + val = ((const u16 *)data)[idx]; + break; + default: + return -EINVAL; + } + + val >>= joy->chans[i].channel->scan_type.shift; + if (sign) + val = sign_extend32(val, msb); + else + val &= GENMASK(msb, 0); + input_report_abs(joy->input, joy->axes[i].code, val); + } + + input_sync(joy->input); + + return 0; +} + +static int adc_joystick_open(struct input_dev *dev) +{ + struct adc_joystick *joy = input_get_drvdata(dev); + struct device *devp = &dev->dev; + int ret; + + ret = iio_channel_start_all_cb(joy->buffer); + if (ret) + dev_err(devp, "Unable to start callback buffer: %d\n", ret); + + return ret; +} + +static void adc_joystick_close(struct input_dev *dev) +{ + struct adc_joystick *joy = input_get_drvdata(dev); + + iio_channel_stop_all_cb(joy->buffer); +} + +static void adc_joystick_cleanup(void *data) +{ + iio_channel_release_all_cb(data); +} + +static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy) +{ + struct adc_joystick_axis *axes; + struct fwnode_handle *child; + int num_axes, ret, i; + + num_axes = device_get_child_node_count(dev); + if (!num_axes) { + dev_err(dev, "Unable to find child nodes\n"); + return -EINVAL; + } + + if (num_axes != joy->num_chans) { + dev_err(dev, "Got %d child nodes for %d channels\n", + num_axes, joy->num_chans); + return -EINVAL; + } + + axes = devm_kmalloc_array(dev, num_axes, sizeof(*axes), GFP_KERNEL); + if (!axes) + return -ENOMEM; + + device_for_each_child_node(dev, child) { + ret = fwnode_property_read_u32(child, "reg", &i); + if (ret) { + dev_err(dev, "reg invalid or missing\n"); + goto err; + } + + if (i >= num_axes) { + ret = -EINVAL; + dev_err(dev, "No matching axis for reg %d\n", i); + goto err; + } + + ret = fwnode_property_read_u32(child, "linux,code", + &axes[i].code); + if (ret) { + dev_err(dev, "linux,code invalid or missing\n"); + goto err; + } + + ret = fwnode_property_read_u32_array(child, "abs-range", + axes[i].range, 2); + if (ret) { + dev_err(dev, "abs-range invalid or missing\n"); + goto err; + } + + fwnode_property_read_u32(child, "abs-fuzz", &axes[i].fuzz); + fwnode_property_read_u32(child, "abs-flat", &axes[i].flat); + + input_set_abs_params(joy->input, axes[i].code, + axes[i].range[0], axes[i].range[1], + axes[i].fuzz, axes[i].flat); + input_set_capability(joy->input, EV_ABS, axes[i].code); + } + + joy->axes = axes; + + return 0; + +err: + fwnode_handle_put(child); + return ret; +} + +static int adc_joystick_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct adc_joystick *joy; + struct input_dev *input; + int bits, ret, i; + + joy = devm_kzalloc(dev, sizeof(*joy), GFP_KERNEL); + if (!joy) + return -ENOMEM; + + joy->chans = devm_iio_channel_get_all(dev); + if (IS_ERR(joy->chans)) { + return dev_err_probe(dev, PTR_ERR(joy->chans), + "Unable to get IIO channels\n"); + } + + /* Count how many channels we got. NULL terminated. */ + 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"); + return -EINVAL; + } + if (bits != joy->chans[0].channel->scan_type.storagebits) { + dev_err(dev, "Channels must have equal storage size\n"); + return -EINVAL; + } + } + joy->num_chans = i; + + input = devm_input_allocate_device(dev); + if (!input) { + dev_err(dev, "Unable to allocate input device\n"); + return -ENOMEM; + } + + joy->input = input; + input->name = pdev->name; + input->id.bustype = BUS_HOST; + input->open = adc_joystick_open; + input->close = adc_joystick_close; + + ret = adc_joystick_set_axes(dev, joy); + if (ret) + return ret; + + input_set_drvdata(input, joy); + ret = input_register_device(input); + if (ret) { + dev_err(dev, "Unable to register input device\n"); + return ret; + } + + 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); + } + + ret = devm_add_action_or_reset(dev, adc_joystick_cleanup, joy->buffer); + if (ret) + dev_err(dev, "Unable to add action\n"); + + return ret; +} + +static const struct of_device_id adc_joystick_of_match[] = { + { .compatible = "adc-joystick", }, + { } +}; +MODULE_DEVICE_TABLE(of, adc_joystick_of_match); + +static struct platform_driver adc_joystick_driver = { + .driver = { + .name = "adc-joystick", + .of_match_table = adc_joystick_of_match, + }, + .probe = adc_joystick_probe, +}; +module_platform_driver(adc_joystick_driver); + +MODULE_DESCRIPTION("Input driver for joysticks connected over ADC"); +MODULE_AUTHOR("Artur Rojek "); +MODULE_LICENSE("GPL"); -- 2.28.0