Skip to contentSkip to conversation

dt-bindings: adc-joystick: add poll-interval

PATCH Superseded Chris Morgan 3 participants 8 messages Aug 3, 2022 – Aug 4, 2022

Subsystems (5)

v10 of 13 Superseded Latest is v13 →

lore
Share & tools
lore
#1 lore raw

PATCH v10 1/3 dt-bindings: adc-joystick: add poll-interval

In reply to Chris Morgan

From: Chris Morgan <[email protected]>

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.

---
 Documentation/devicetree/bindings/input/adc-joystick.yaml | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/input/adc-joystick.yaml +5 -0
index 2ee04e03bc22..ab5caad055ea 100644
@@ -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
 
Signature · 1 line
2.25.1
#0 lore raw

v10 cover dt-bindings: adc-joystick: add poll-interval

From: Chris Morgan <[email protected]>

Add support to the existing adc-joystick driver to support polling rather than relying on triggered buffers. This is useful for devices that do not offer triggered buffers in hardware. Code adapted from changes made by Maya Matuszczyk <[email protected]>.

Changes from V9:
- Simplified skipping of channel checking logic.
- Simplified return logic for driver probe.

Changes from V8:
- Changed logic for checking channels to skip checking of storagebits.
- Changed comment format to comply with Linux style rules.

Changes from V7:
- Dropped acks from adc-joystick.c changes, as it has been altered somewhat since v7.
- Improved checking value of poll-interval to ensure explicit error handling in the event of malformed values.
- Adjusted logic to not check for storagebits if polling is in use, which allows adc-joystick to work in polling mode for devices that utilize a mux (such as the Odroid Go Super and the Anbernic RG353).
- Changed error message and channel size comparison logic slightly to ensure code can fit within 80 character column width.

Changes from V6:
- Reverted back to "poll-interval" after mailing list discussion.
- Referenced input.yaml for definition of poll-interval in adc-joystick documentation.

Changes from V5:
- Corrected an error found by yamllint in the documentation.

Changes from V4:
- Added unit property to devicetree attribute making it now "poll-interval-ms".
- Simplified logic for setting polled value and made variable names more clear.

Changes from V3:
- After lengthy discussion decided to support with existing attribute of "poll-interval". If present, the driver will use polling and if not present, it will use triggered buffers (as the driver does today).
- Corrected some lines to honor the 80 character line-limit.
- Check return value from polling method and return early if there is an error reading the data.

Changes from V2:
- Changed parameter from "adc-joystick,polled" to "adc-joystick,no-hardware-trigger" as it is more representative of what the driver and hardware are doing.

Changes from V1:
- Removed driver compatible string of "adc-joystick-polled".
- Added new optional boolean value of "adc-joystick,polled".
- Cleaned up if statements regarding polling behavior.

Chris Morgan (3):
dt-bindings: adc-joystick: add poll-interval
Input: adc-joystick - Add polled input device support
arm64: dts: rockchip: Update joystick to polled for OG2

 .../bindings/input/adc-joystick.yaml          |  5 ++
 .../boot/dts/rockchip/rk3326-odroid-go2.dts   |  1 +
 drivers/input/joystick/adc-joystick.c         | 53 ++++++++++++++++---
 3 files changed, 53 insertions(+), 6 deletions(-)
Signature · 1 line
2.25.1
#2 lore raw

PATCH v10 2/3 Input: adc-joystick - Add polled input device support

From: Chris Morgan <[email protected]>

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.

---
 drivers/input/joystick/adc-joystick.c | 53 ++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)
drivers/input/joystick/adc-joystick.c +47 -6
index 78ebca7d400a..a288ebfe254e 100644
@@ -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,11 +208,25 @@ 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++) {
+		if (joy->polled)
+			continue;
 		bits = joy->chans[i].channel->scan_type.storagebits;
 		if (!bits || bits > 16) {
-			dev_err(dev, "Unsupported channel storage size\n");
+			dev_err(dev,
+				"Unsupported channel storage size\n");
 			return -EINVAL;
 		}
 		if (bits != joy->chans[0].channel->scan_type.storagebits) {
@@ -215,8 +245,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,13 +265,18 @@ static int adc_joystick_probe(struct platform_device *pdev)
 		return error;
 	}
 
-	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy);
+	if (joy->polled)
+		return 0;
+
+	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);
+	error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
+					 joy->buffer);
 	if (error)  {
 		dev_err(dev, "Unable to add action\n");
 		return error;
Signature · 1 line
2.25.1
#7 lore raw

PATCH v10 3/3 arm64: dts: rockchip: Update joystick to polled for OG2

In reply to Chris Morgan

From: Chris Morgan <[email protected]>

Update the Odroid Go Advance to use "poll-interval" from the adc-joystick driver.

---
 arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts +1 -0
index 415aa9ff8bd4..3389755dbdc8 100644
@@ -26,6 +26,7 @@ adc-joystick {
 		compatible = "adc-joystick";
 		io-channels = <&saradc 1>,
 			      <&saradc 2>;
+		poll-interval = <60>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 
Signature · 1 line
2.25.1
#3 lore raw

Re: [PATCH v10 2/3] Input: adc-joystick - Add polled input device support

In reply to Chris Morgan
Quoted 10 lines · Chris Morgan

From: Chris Morgan <[email protected]>

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.

---

Chris,
some minor details inline.

Quoted 57 lines
 drivers/input/joystick/adc-joystick.c | 53 ++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)
drivers/input/joystick/adc-joystick.c +16 -0
index 78ebca7d400a..a288ebfe254e 100644
@@ -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);
drivers/input/joystick/adc-joystick.c +10 -1
 	if (!joy)
@@ -192,11 +208,25 @@ 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.

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 230

Quoted 10 lines
drivers/input/joystick/adc-joystick.c +6 -1
+	 * Do not check the storage size if using polling.
+	 */
 	for (i = 0; joy->chans[i].indio_dev; i++) {
+		if (joy->polled)
+			continue;
 		bits = joy->chans[i].channel->scan_type.storagebits;
 		if (!bits || bits > 16) {
-			dev_err(dev, "Unsupported channel storage size\n");
+			dev_err(dev,
+				"Unsupported channel storage size\n");

This change is now unnecessary, as the line can fit in 80 chars again.

Quoted 22 lines
drivers/input/joystick/adc-joystick.c +0 -0
 			return -EINVAL;
 		}
drivers/input/joystick/adc-joystick.c +8 -2
 		if (bits != joy->chans[0].channel->scan_type.storagebits) {
@@ -215,8 +245,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);
drivers/input/joystick/adc-joystick.c +0 -0
 	if (error)

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 273

Quoted 10 lines
drivers/input/joystick/adc-joystick.c +5 -1
@@ -229,13 +265,18 @@ static int adc_joystick_probe(struct
 platform_device *pdev)
 		return error;
 	}
 
-	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy);
+	if (joy->polled)
+		return 0;
+
+	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle,
+					     joy);

Same here.

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct platform_device *pdev) · line 279

Quoted 9 lines
drivers/input/joystick/adc-joystick.c +2 -1
 	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);
+	error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
+					 joy->buffer);

And here.

Quoted 3 lines
drivers/input/joystick/adc-joystick.c +0 -0
 	if (error)  {
drivers/input/joystick/adc-joystick.c +0 -0
 		dev_err(dev, "Unable to add action\n");
 		return error;
#4 lore raw

Re: [PATCH v10 2/3] Input: adc-joystick - Add polled input device support

Quoted 119 lines · Artur Rojek
Quoted 10 lines · Chris Morgan

From: Chris Morgan <[email protected]>

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.

---

Chris,
some minor details inline.

Quoted 57 lines
 drivers/input/joystick/adc-joystick.c | 53 ++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)
drivers/input/joystick/adc-joystick.c +16 -0
index 78ebca7d400a..a288ebfe254e 100644
@@ -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);
drivers/input/joystick/adc-joystick.c +10 -1
 	if (!joy)
@@ -192,11 +208,25 @@ 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.

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 230

Quoted 10 lines
drivers/input/joystick/adc-joystick.c +6 -1
+	 * Do not check the storage size if using polling.
+	 */
 	for (i = 0; joy->chans[i].indio_dev; i++) {
+		if (joy->polled)
+			continue;
 		bits = joy->chans[i].channel->scan_type.storagebits;
 		if (!bits || bits > 16) {
-			dev_err(dev, "Unsupported channel storage size\n");
+			dev_err(dev,
+				"Unsupported channel storage size\n");

This change is now unnecessary, as the line can fit in 80 chars again.

Quoted 22 lines
drivers/input/joystick/adc-joystick.c +0 -0
 			return -EINVAL;
 		}
drivers/input/joystick/adc-joystick.c +8 -2
 		if (bits != joy->chans[0].channel->scan_type.storagebits) {
@@ -215,8 +245,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);
drivers/input/joystick/adc-joystick.c +0 -0
 	if (error)

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 273

Quoted 10 lines
drivers/input/joystick/adc-joystick.c +5 -1
@@ -229,13 +265,18 @@ static int adc_joystick_probe(struct
 platform_device *pdev)
 		return error;
 	}
 
-	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy);
+	if (joy->polled)
+		return 0;
+
+	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle,
+					     joy);

Same here.

Quoted 5 lines
drivers/input/joystick/adc-joystick.c +0 -0
 	if (IS_ERR(joy->buffer)) {
 		dev_err(dev, "Unable to allocate callback buffer\n");
 		return PTR_ERR(joy->buffer);
 	}
 
Quoted 5 lines

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct platform_device *pdev) · line 279

Quoted 4 lines
drivers/input/joystick/adc-joystick.c +2 -1
-	error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
 joy->buffer);
+	error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
+					 joy->buffer);

And here.

This one comes in at 82 when I make it a one-liner. I'll update the others but leave this one here alone.

Thank you.

Quoted 3 lines
Quoted 3 lines
drivers/input/joystick/adc-joystick.c +0 -0
 	if (error)  {
drivers/input/joystick/adc-joystick.c +0 -0
 		dev_err(dev, "Unable to add action\n");
 		return error;
#5 lore raw

Re: [PATCH v10 2/3] Input: adc-joystick - Add polled input device support

Quoted 120 lines · Chris Morgan
Quoted 119 lines · Artur Rojek
Quoted 10 lines · Chris Morgan

From: Chris Morgan <[email protected]>

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.

---

Chris,
some minor details inline.

Quoted 57 lines
 drivers/input/joystick/adc-joystick.c | 53 ++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)
drivers/input/joystick/adc-joystick.c +16 -0
index 78ebca7d400a..a288ebfe254e 100644
@@ -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);
drivers/input/joystick/adc-joystick.c +10 -1
 	if (!joy)
@@ -192,11 +208,25 @@ 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.

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 230

Quoted 10 lines
drivers/input/joystick/adc-joystick.c +6 -1
+	 * Do not check the storage size if using polling.
+	 */
 	for (i = 0; joy->chans[i].indio_dev; i++) {
+		if (joy->polled)
+			continue;
 		bits = joy->chans[i].channel->scan_type.storagebits;
 		if (!bits || bits > 16) {
-			dev_err(dev, "Unsupported channel storage size\n");
+			dev_err(dev,
+				"Unsupported channel storage size\n");

This change is now unnecessary, as the line can fit in 80 chars again.

Quoted 22 lines
drivers/input/joystick/adc-joystick.c +0 -0
 			return -EINVAL;
 		}
drivers/input/joystick/adc-joystick.c +8 -2
 		if (bits != joy->chans[0].channel->scan_type.storagebits) {
@@ -215,8 +245,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);
drivers/input/joystick/adc-joystick.c +0 -0
 	if (error)

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 273

Quoted 10 lines
drivers/input/joystick/adc-joystick.c +5 -1
@@ -229,13 +265,18 @@ static int adc_joystick_probe(struct
 platform_device *pdev)
 		return error;
 	}
 
-	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy);
+	if (joy->polled)
+		return 0;
+
+	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle,
+					     joy);

Same here.

Quoted 5 lines
drivers/input/joystick/adc-joystick.c +0 -0
 	if (IS_ERR(joy->buffer)) {
 		dev_err(dev, "Unable to allocate callback buffer\n");
 		return PTR_ERR(joy->buffer);
 	}
 
Quoted 8 lines
Quoted 5 lines

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct platform_device *pdev) · line 279

Quoted 4 lines
drivers/input/joystick/adc-joystick.c +2 -1
-	error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
 joy->buffer);
+	error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
+					 joy->buffer);

And here.

This one comes in at 82 when I make it a one-liner. I'll update the others but leave this one here alone.

It doesn't relate to the polled input functionality anymore, so please remove it. I'll correct such minor mistakes with a larger cleanup patch eventually.

Cheers,
Artur

Quoted 6 lines

Thank you.

Quoted 3 lines
Quoted 3 lines
drivers/input/joystick/adc-joystick.c +0 -0
 	if (error)  {
drivers/input/joystick/adc-joystick.c +0 -0
 		dev_err(dev, "Unable to add action\n");
 		return error;
#6 lore raw

Re: [PATCH v10 2/3] Input: adc-joystick - Add polled input device support

Quoted 127 lines · Artur Rojek
Quoted 126 lines · Chris Morgan
Quoted 124 lines · Artur Rojek
Quoted 10 lines · Chris Morgan

From: Chris Morgan <[email protected]>

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.

---

Chris,
some minor details inline.

Quoted 57 lines
 drivers/input/joystick/adc-joystick.c | 53 ++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)
drivers/input/joystick/adc-joystick.c +16 -0
index 78ebca7d400a..a288ebfe254e 100644
@@ -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);
drivers/input/joystick/adc-joystick.c +10 -1
 	if (!joy)
@@ -192,11 +208,25 @@ 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.

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 230

Quoted 10 lines
drivers/input/joystick/adc-joystick.c +6 -1
+	 * Do not check the storage size if using polling.
+	 */
 	for (i = 0; joy->chans[i].indio_dev; i++) {
+		if (joy->polled)
+			continue;
 		bits = joy->chans[i].channel->scan_type.storagebits;
 		if (!bits || bits > 16) {
-			dev_err(dev, "Unsupported channel storage size\n");
+			dev_err(dev,
+				"Unsupported channel storage size\n");

This change is now unnecessary, as the line can fit in 80 chars again.

Quoted 22 lines
drivers/input/joystick/adc-joystick.c +0 -0
 			return -EINVAL;
 		}
drivers/input/joystick/adc-joystick.c +8 -2
 		if (bits != joy->chans[0].channel->scan_type.storagebits) {
@@ -215,8 +245,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);
drivers/input/joystick/adc-joystick.c +0 -0
 	if (error)

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 273

Quoted 10 lines
drivers/input/joystick/adc-joystick.c +5 -1
@@ -229,13 +265,18 @@ static int adc_joystick_probe(struct
 platform_device *pdev)
 		return error;
 	}
 
-	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle, joy);
+	if (joy->polled)
+		return 0;
+
+	joy->buffer = iio_channel_get_all_cb(dev, adc_joystick_handle,
+					     joy);

Same here.

drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct platform_device *pdev) · line 279

Quoted 9 lines
drivers/input/joystick/adc-joystick.c +2 -1
 	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);
+	error = devm_add_action_or_reset(dev, adc_joystick_cleanup,
+					 joy->buffer);

And here.

Quoted 6 lines
Quoted 3 lines

This one comes in at 82 when I make it a one-liner. I'll update the others but
leave this one here alone.

It doesn't relate to the polled input functionality anymore, so please remove it. I'll correct such minor mistakes with a larger cleanup patch eventually.

Sorry, I resent too fast. I'll wait until tomorrow and send this (one last time hopefully) with this other line removed.

Thank you.

Quoted 9 lines

Cheers,
Artur

Quoted 6 lines

Thank you.

Quoted 3 lines
Quoted 3 lines
drivers/input/joystick/adc-joystick.c +0 -0
 	if (error)  {
drivers/input/joystick/adc-joystick.c +0 -0
 		dev_err(dev, "Unable to add action\n");
 		return error;