From mboxrd@z Thu Jan 1 00:00:00 1970 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=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 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 93C37C433E5 for ; Mon, 20 Jul 2020 10:04:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6C57522BEF for ; Mon, 20 Jul 2020 10:04:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595239466; bh=S3SUPZW345R7i9qMgaENXJxqCmJIqrPAtkWW/RcVyd8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=JWJKoJJjqsJwBC/hWuiupF+Z4jl3nV9pEZOwp65DclLm4acW1CEmEC9s8stIwcmqP qyoU3cBcOIjQddhwZzUkacvlN8Bm/NacI+bmZQdmmZIJbDrSulVLkPAdo6Mp0StQn8 TaSsyPSxHqAgxITIywBWSe3PYrGinYhf3g7QIeI4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728436AbgGTKEZ (ORCPT ); Mon, 20 Jul 2020 06:04:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:57482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728001AbgGTKEY (ORCPT ); Mon, 20 Jul 2020 06:04:24 -0400 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CDEA821775; Mon, 20 Jul 2020 10:04:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595239463; bh=S3SUPZW345R7i9qMgaENXJxqCmJIqrPAtkWW/RcVyd8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=xqtCP8sZxk79euErWq3KfZAcDRANVG1S7yYJKIAU+p+KKkFdhsMcpw3nKxuLE8XBz mo6uvUL9Mf9DFoCYNAIw0UIbIEX3pJZW+d3tinIXu7r81VEIGHLwelFg51CJVaybrs 1ypS4R099Cs8h4/SfN/kd9zsvdeM+IokVZk7oazA= Date: Mon, 20 Jul 2020 11:04:19 +0100 From: Jonathan Cameron To: Artur Rojek Cc: Dmitry Torokhov , Rob Herring , Mark Rutland , Paul Cercueil , Andy Shevchenko , Heiko Stuebner , Ezequiel Garcia , linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v8 2/2] input: joystick: Add ADC attached joystick driver. Message-ID: <20200720110419.0c32ad82@archlinux> In-Reply-To: <20200719221103.91644-3-contact@artur-rojek.eu> References: <20200719221103.91644-1-contact@artur-rojek.eu> <20200719221103.91644-3-contact@artur-rojek.eu> X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 20 Jul 2020 00:11:03 +0200 Artur Rojek wrote: > 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 > Acked-by: Dmitry Torokhov Looks good to me. Acked-by: Jonathan Cameron I'm assuming this will got through input. Jonathan > --- > > Changes: > > v2: - sanity check supported channel format on probe, > - rename adc_joystick_disable to a more sensible adc_joystick_cleanup, > - enforce correct axis order by checking the `reg` property of > child nodes > > v3-v5: no change > > v6: - remove redundant `` > - set `val` for each endianness case in their respective branches > - pass received error codes to return value of `adc_joystick_set_axes` > - change `(bits >> 3) > 2` to `bits > 16` for readability > - drop `of_match_ptr` > > v7: no change > > 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[] > > drivers/input/joystick/Kconfig | 10 + > drivers/input/joystick/Makefile | 1 + > drivers/input/joystick/adc-joystick.c | 253 ++++++++++++++++++++++++++ > 3 files changed, 264 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..a2c570de0b8a > --- /dev/null > +++ b/drivers/input/joystick/adc-joystick.c > @@ -0,0 +1,253 @@ > +// 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); > + int ret; > + > + ret = iio_channel_start_all_cb(joy->buffer); > + if (ret) > + dev_err(dev->dev.parent, "Unable to start callback buffer"); > + > + 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"); > + return -EINVAL; > + } > + > + if (num_axes != joy->num_chans) { > + dev_err(dev, "Got %d child nodes for %d channels", > + 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"); > + goto err; > + } > + > + if (i >= num_axes) { > + ret = -EINVAL; > + dev_err(dev, "No matching axis for reg %d", i); > + goto err; > + } > + > + ret = fwnode_property_read_u32(child, "linux,code", > + &axes[i].code); > + if (ret) { > + dev_err(dev, "linux,code invalid or missing"); > + 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"); > + 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)) { > + ret = PTR_ERR(joy->chans); > + if (ret != -EPROBE_DEFER) > + dev_err(dev, "Unable to get IIO channels"); > + return ret; > + } > + > + /* 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"); > + return -EINVAL; > + } > + if (bits != joy->chans[0].channel->scan_type.storagebits) { > + dev_err(dev, "Channels must have equal storage size"); > + return -EINVAL; > + } > + } > + joy->num_chans = i; > + > + input = devm_input_allocate_device(dev); > + if (!input) { > + dev_err(dev, "Unable to allocate input device"); > + 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: %d", ret); > + 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"); > + 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"); > + > + 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");