adc-joystick: Add polled support
Subsystems (4)
cover adc-joystick: Add polled support
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]>.
Chris Morgan (3):
dt-bindings: adc-joystick: bindings for adc-joystick-polled
Input: adc-joystick - Add polled input device support
arm64: dts: rockchip: Update joystick to polled for Odroid-Go2
.../bindings/input/adc-joystick.yaml | 8 ++- .../boot/dts/rockchip/rk3326-odroid-go2.dts | 2 +- drivers/input/joystick/adc-joystick.c | 53 +++++++++++++++---- 3 files changed, 49 insertions(+), 14 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/3 dt-bindings: adc-joystick: bindings for adc-joystick-polled
From: Chris Morgan <[email protected]>
Add devicetree bindings for adc-joystick-polled.
--- Documentation/devicetree/bindings/input/adc-joystick.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/input/adc-joystick.yaml +6 -2
@@ -12,11 +12,15 @@ maintainers: description: > Bindings for joystick devices connected to ADC controllers supporting - the Industrial I/O subsystem. + the Industrial I/O subsystem. Supports both polled devices where no + iio trigger is available and non-polled devices which are triggered + by iio. properties: compatible: - const: adc-joystick + enum: + - adc-joystick + - adc-joystick-polled io-channels: minItems: 1
Signature · 1 line
2.25.1
Re: [PATCH 1/3] dt-bindings: adc-joystick: bindings for adc-joystick-polled
Quoted 1 line · Chris Morgan
From: Chris Morgan <[email protected]>
Hi Chris,
Quoted 20 lines
Add devicetree bindings for adc-joystick-polled.
Signed-off-by Maya Matuszczyk <[email protected]>Signed-off-by Chris Morgan <[email protected]>--- Documentation/devicetree/bindings/input/adc-joystick.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)Documentation/devicetree/bindings/input/adc-joystick.yaml +0
-0@@ -12,11 +12,15 @@ maintainers: description: > Bindings for joystick devices connected to ADC controllerssupporting
Documentation/devicetree/bindings/input/adc-joystick.yaml +0
-1- the Industrial I/O subsystem.
Documentation/devicetree/bindings/input/adc-joystick.yaml maintainers: · line 23
Quoted 10 lines
Documentation/devicetree/bindings/input/adc-joystick.yaml +6
-1+ the Industrial I/O subsystem. Supports both polled devices where no + iio trigger is available and non-polled devices which are triggered + by iio. properties: compatible: - const: adc-joystick + enum: + - adc-joystick + - adc-joystick-polled
There is no need to create a new compatible for your functionality. Instead, just add a new (optional) property.
cheers,
Artur
Quoted 3 lines
io-channels:
minItems: 1
Rob Herring
maintainerRe: [PATCH 1/3] dt-bindings: adc-joystick: bindings for adc-joystick-polled
Quoted 28 lines · Artur Rojek
Quoted 1 line · Chris Morgan
From: Chris Morgan <[email protected]>
Hi Chris,
Quoted 23 lines
Add devicetree bindings for adc-joystick-polled.
Signed-off-by Maya Matuszczyk <[email protected]>Signed-off-by Chris Morgan <[email protected]>--- Documentation/devicetree/bindings/input/adc-joystick.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)Documentation/devicetree/bindings/input/adc-joystick.yaml +3
-1@@ -12,11 +12,15 @@ maintainers: description: > Bindings for joystick devices connected to ADC controllers supporting - the Industrial I/O subsystem. + the Industrial I/O subsystem. Supports both polled devices where no + iio trigger is available and non-polled devices which are triggered + by iio.
Quoted 9 lines
Documentation/devicetree/bindings/input/adc-joystick.yaml maintainers: · line 23
Quoted 6 lines
Documentation/devicetree/bindings/input/adc-joystick.yaml +3
-1properties: compatible: - const: adc-joystick + enum: + - adc-joystick + - adc-joystick-polledThere is no need to create a new compatible for your functionality. Instead, just add a new (optional) property.
Perhaps the already defined for input devices 'poll-interval'.
Rob
PATCH 2/3 Input: adc-joystick - Add polled input device support
In reply to Chris MorganFrom: 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, 42 insertions(+), 11 deletions(-)
drivers/input/joystick/adc-joystick.c +42 -11
@@ -13,6 +13,10 @@#include <asm/unaligned.h> +#define ADC_JSK_POLL_INTERVAL 16 +#define ADC_JSK_POLL_MIN 8 +#define ADC_JSK_POLL_MAX 32 +struct adc_joystick_axis {u32 code;s32 range[2 ];
@@ -26,8 +30,21 @@ 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; + +for (i =0 ; i < joy->num_chans; i++) { +iio_read_channel_raw (&joy->chans[i], &val); +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;
@@ -215,8 +232,19 @@ 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 (of_device_is_compatible (dev->of_node,"adc-joystick-polled" )) + joy->polled =1 ; + +if (joy->polled ==1 ) { +input_setup_polling (input, adc_joystick_poll); +input_set_poll_interval (input,ADC_JSK_POLL_INTERVAL ); +input_set_min_poll_interval (input,ADC_JSK_POLL_MIN ); +input_set_max_poll_interval (input,ADC_JSK_POLL_MAX ); + }else { + input->open = adc_joystick_open; + input->close = adc_joystick_close; + } error =adc_joystick_set_axes (dev, joy);if (error)
@@ -229,16 +257,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 (IS_ERR (joy->buffer)) { -dev_err (dev,"Unable to allocate callback buffer\n" ); -return PTR_ERR (joy->buffer); - } +if (joy->polled ==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); -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 ;
@@ -246,6 +276,7 @@ static int adc_joystick_probe(struct platform_device *pdev)static const struct of_device_id adc_joystick_of_match[] = { { .compatible ="adc-joystick" , }, + { .compatible ="adc-joystick-polled" , }, { } };MODULE_DEVICE_TABLE (of, adc_joystick_of_match);
Signature · 1 line
2.25.1
Re: [PATCH 2/3] Input: adc-joystick - Add polled input device support
Quoted 1 line · Chris Morgan
From: Chris Morgan <[email protected]>
Hi Chris,
Thanks for your patch. Here's some things I spotted on a quick glance. I'll test this patch against the existing (non-poll) devices over, or after the weekend.
Quoted 51 lines
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.cchanges made by Maya Matuszczyk.Signed-off-by Maya Matuszczyk <[email protected]>Signed-off-by Chris Morgan <[email protected]>--- drivers/input/joystick/adc-joystick.c | 53 +++++++++++++++++++++------ 1 file changed, 42 insertions(+), 11 deletions(-)drivers/input/joystick/adc-joystick.c +17
-0@@ -13,6 +13,10 @@#include <asm/unaligned.h> +#define ADC_JSK_POLL_INTERVAL 16 +#define ADC_JSK_POLL_MIN 8 +#define ADC_JSK_POLL_MAX 32 +struct adc_joystick_axis {u32 code;s32 range[2 ];@@ -26,8 +30,21 @@ 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; + +for (i =0 ; i < joy->num_chans; i++) { +iio_read_channel_raw (&joy->chans[i], &val); +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;
drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 238
Quoted 9 lines
drivers/input/joystick/adc-joystick.c +3
-2@@ -215,8 +232,19 @@ 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 (of_device_is_compatible (dev->of_node,"adc-joystick-polled" )) + joy->polled =1 ;
Don't use a new compatible for that (see my comment for patch 1/3). Keep it as a property and then you can access it through fwnode_property_read_bool.
drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 240
Quoted 2 lines
drivers/input/joystick/adc-joystick.c +2
-0+ +if (joy->polled ==1 ) {
It's a bool, so just do if (joy->polled).
Quoted 12 lines
drivers/input/joystick/adc-joystick.c +8
-0+input_setup_polling (input, adc_joystick_poll); +input_set_poll_interval (input,ADC_JSK_POLL_INTERVAL ); +input_set_min_poll_interval (input,ADC_JSK_POLL_MIN ); +input_set_max_poll_interval (input,ADC_JSK_POLL_MAX ); + }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
-0if (error)
drivers/input/joystick/adc-joystick.c static int adc_joystick_probe(struct · line 261
Quoted 10 lines
drivers/input/joystick/adc-joystick.c +1
-5@@ -229,16 +257,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 (IS_ERR (joy->buffer)) { -dev_err (dev,"Unable to allocate callback buffer\n" ); -return PTR_ERR (joy->buffer); - } +if (joy->polled ==0 ) {
Same here. Just do if (!joy->polled).
Cheers,
Artur
Quoted 29 lines
drivers/input/joystick/adc-joystick.c +10
-4+ 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; + }drivers/input/joystick/adc-joystick.c +1
-0}return 0 ;@@ -246,6 +276,7 @@ static int adc_joystick_probe(struct platform_device *pdev)static const struct of_device_id adc_joystick_of_match[] = { { .compatible ="adc-joystick" , }, + { .compatible ="adc-joystick-polled" , }, { } };
MODULE_DEVICE_TABLE(of, adc_joystick_of_match);
PATCH 3/3 arm64: dts: rockchip: Update joystick to polled for Odroid-Go2
In reply to Chris MorganFrom: Chris Morgan <[email protected]>
Update the Odroid Go Advance to use the polled method from the adc-joystick driver.
--- arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts +1 -1
@@ -23,7 +23,7 @@ chosen { }; adc-joystick { - compatible = "adc-joystick"; + compatible = "adc-joystick-polled"; io-channels = <&saradc 1>, <&saradc 2>; #address-cells = <1>;
Signature · 1 line
2.25.1