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=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 01974C2D0EB for ; Sun, 29 Mar 2020 09:48:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C30E420838 for ; Sun, 29 Mar 2020 09:48:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585475297; bh=GkFELvORyF0M6b2rBZQLJy86YfPwmXvnBQAwczK16VM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=PjYERHTQtD27JnBW5QiYunljG4Zm+KwF3viBxxeMrz+JLCT8RKpMR0bBlHCOywwEg EmMqJ6rHDAP7pHpLKxj9b6n0BisJHBCFqEDd17zstlVWYWYpQ2LUiLZ90aFMgwfpwo hBwd/M1QC+/gftGcjxsF4opBRINrRgQ4YaLe0KwE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727932AbgC2JsR (ORCPT ); Sun, 29 Mar 2020 05:48:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:50942 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727791AbgC2JsQ (ORCPT ); Sun, 29 Mar 2020 05:48:16 -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 EA9DE20675; Sun, 29 Mar 2020 09:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585475295; bh=GkFELvORyF0M6b2rBZQLJy86YfPwmXvnBQAwczK16VM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=GiStZpBbREOvscqidD1tqstDxHfpVwKJx5y854DAaiJPTDUq0lAD6yAFPczz4r1uR SoqwQaDY0tPaEJ4L7JUsOLgbr5QtqZMJt8vp9mlgO6jOqpYHokdNZHmFAmrbDFfvJd K/U5jTgreP02MLrF7en74i45lMAwf+sQ2HSbiWWI= Date: Sun, 29 Mar 2020 10:48:11 +0100 From: Jonathan Cameron To: Artur Rojek Cc: Dmitry Torokhov , Rob Herring , Mark Rutland , Paul Cercueil , Heiko Stuebner , linux-input@vger.kernel.org, devicetree@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 5/5] input: joystick: Add ADC attached joystick driver. Message-ID: <20200329104811.5c3daafc@archlinux> In-Reply-To: <20200324112336.29755-5-contact@artur-rojek.eu> References: <20200324112336.29755-1-contact@artur-rojek.eu> <20200324112336.29755-5-contact@artur-rojek.eu> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org On Tue, 24 Mar 2020 12:23:36 +0100 Artur Rojek wrote: > Add a driver for joystick devices connected to ADC controllers > supporting the Industrial I/O subsystem. >=20 > Signed-off-by: Artur Rojek > Tested-by: Paul Cercueil > Tested-by: Heiko Stuebner > Acked-by: Dmitry Torokhov Whole series looks good to me. So now or the question of how to take it (if I've forgotten us already having this conversation please remind me!) =46rom an IIO point of view we've missed the coming merge window. I 'think' patches * 1-3 are IIO only and * 4-5 input only. It should be fine to either take them separately through the relevant trees. Dmitry, would you prefer that or shall I do an immutable branch based on rc1 in a few weeks time? Jonathan > --- >=20 > v2: - sanity check supported channel format on probe, > - rename adc_joystick_disable to a more sensible adc_joystick_cleanu= p,=20 > - enforce correct axis order by checking the `reg` property of > child nodes >=20 > v3-v5: no change >=20 > drivers/input/joystick/Kconfig | 10 ++ > drivers/input/joystick/Makefile | 1 + > drivers/input/joystick/adc-joystick.c | 245 ++++++++++++++++++++++++++ > 3 files changed, 256 insertions(+) > create mode 100644 drivers/input/joystick/adc-joystick.c >=20 > diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kcon= fig > index 940b744639c7..efbc20ec5099 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. > =20 > +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/Mak= efile > 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. > =20 > obj-$(CONFIG_JOYSTICK_A3D) +=3D a3d.o > +obj-$(CONFIG_JOYSTICK_ADC) +=3D adc-joystick.o > obj-$(CONFIG_JOYSTICK_ADI) +=3D adi.o > obj-$(CONFIG_JOYSTICK_AMIGA) +=3D amijoy.o > obj-$(CONFIG_JOYSTICK_AS5011) +=3D as5011.o > diff --git a/drivers/input/joystick/adc-joystick.c b/drivers/input/joysti= ck/adc-joystick.c > new file mode 100644 > index 000000000000..9cb9896da26e > --- /dev/null > +++ b/drivers/input/joystick/adc-joystick.c > @@ -0,0 +1,245 @@ > +// 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 > +#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 =3D private; > + enum iio_endian endianness; > + int bytes, msb, val, i; > + bool sign; > + > + bytes =3D joy->chans[0].channel->scan_type.storagebits >> 3; > + > + for (i =3D 0; i < joy->num_chans; ++i) { > + endianness =3D joy->chans[i].channel->scan_type.endianness; > + msb =3D joy->chans[i].channel->scan_type.realbits - 1; > + sign =3D (tolower(joy->chans[i].channel->scan_type.sign) =3D=3D 's'); > + > + switch (bytes) { > + case 1: > + val =3D ((const u8 *)data)[i]; > + break; > + case 2: > + val =3D ((const u16 *)data)[i]; > + if (endianness =3D=3D IIO_BE) > + val =3D be16_to_cpu(val); > + else if (endianness =3D=3D IIO_LE) > + val =3D le16_to_cpu(val); > + break; > + default: > + return -EINVAL; > + } > + > + val >>=3D joy->chans[i].channel->scan_type.shift; > + if (sign) > + val =3D sign_extend32(val, msb); > + else > + val &=3D 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 =3D input_get_drvdata(dev); > + int ret; > + > + ret =3D 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 =3D 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 =3D device_get_child_node_count(dev); > + if (!num_axes) { > + dev_err(dev, "Unable to find child nodes"); > + return -EINVAL; > + } > + > + if (num_axes !=3D joy->num_chans) { > + dev_err(dev, "Got %d child nodes for %d channels", > + num_axes, joy->num_chans); > + return -EINVAL; > + } > + > + axes =3D devm_kmalloc_array(dev, num_axes, sizeof(*axes), GFP_KERNEL); > + if (!axes) > + return -ENOMEM; > + > + device_for_each_child_node(dev, child) { > + ret =3D fwnode_property_read_u32(child, "reg", &i); > + if (ret || i >=3D num_axes) { > + dev_err(dev, "reg invalid or missing"); > + goto err; > + } > + > + if (fwnode_property_read_u32(child, "linux,code", > + &axes[i].code)) { > + dev_err(dev, "linux,code invalid or missing"); > + goto err; > + } > + > + if (fwnode_property_read_u32_array(child, "abs-range", > + axes[i].range, 2)) { > + 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 =3D axes; > + > + return 0; > + > +err: > + fwnode_handle_put(child); > + return -EINVAL; > +} > + > +static int adc_joystick_probe(struct platform_device *pdev) > +{ > + struct device *dev =3D &pdev->dev; > + struct adc_joystick *joy; > + struct input_dev *input; > + int bits, ret, i; > + > + joy =3D devm_kzalloc(dev, sizeof(*joy), GFP_KERNEL); > + if (!joy) > + return -ENOMEM; > + > + joy->chans =3D devm_iio_channel_get_all(dev); > + if (IS_ERR(joy->chans)) { > + ret =3D PTR_ERR(joy->chans); > + if (ret !=3D -EPROBE_DEFER) > + dev_err(dev, "Unable to get IIO channels"); > + return ret; > + } > + > + /* Count how many channels we got. NULL terminated. */ > + while (joy->chans[joy->num_chans].indio_dev) > + joy->num_chans++; > + > + bits =3D joy->chans[0].channel->scan_type.storagebits; > + if (!bits || (bits >> 3) > 2) { > + dev_err(dev, "Unsupported channel storage size"); > + return -EINVAL; > + } > + for (i =3D 1; i < joy->num_chans; ++i) > + if (joy->chans[i].channel->scan_type.storagebits !=3D bits) { > + dev_err(dev, "Channels must have equal storage size"); > + return -EINVAL; > + } > + > + input =3D devm_input_allocate_device(dev); > + if (!input) { > + dev_err(dev, "Unable to allocate input device"); > + return -ENOMEM; > + } > + > + joy->input =3D input; > + input->name =3D pdev->name; > + input->id.bustype =3D BUS_HOST; > + input->open =3D adc_joystick_open; > + input->close =3D adc_joystick_close; > + > + ret =3D adc_joystick_set_axes(dev, joy); > + if (ret) > + return ret; > + > + input_set_drvdata(input, joy); > + ret =3D input_register_device(input); > + if (ret) { > + dev_err(dev, "Unable to register input device: %d", ret); > + return ret; > + } > + > + joy->buffer =3D 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 =3D 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[] =3D { > + { .compatible =3D "adc-joystick", }, > + { }, > +}; > +MODULE_DEVICE_TABLE(of, adc_joystick_of_match); > + > +static struct platform_driver adc_joystick_driver =3D { > + .driver =3D { > + .name =3D "adc-joystick", > + .of_match_table =3D of_match_ptr(adc_joystick_of_match), > + }, > + .probe =3D 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");