On Wed, May 04, 2016 at 12:24:40PM +0200, Dirk Behme wrote:
> From: Knut Wohlrab <Knut.Wohlrab@xxxxxxxxxxxx>
>
> Add device tree support for idle and finger scanning frequency.
>
> For usage details see documentation.
>
> Signed-off-by: Knut Wohlrab <Knut.Wohlrab@xxxxxxxxxxxx>
> Signed-off-by: Oleksij Rempel <linux@xxxxxxxxxxxxxxxx>
> ---
> .../devicetree/bindings/input/touchscreen/zforce_ts.txt | 4 ++++
> drivers/input/touchscreen/zforce_ts.c | 15 ++++++++++++++-
> include/linux/platform_data/zforce_ts.h | 2 ++
> 3 files changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
> index e3c27c4..d8d57ba 100644
> --- a/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
> +++ b/Documentation/devicetree/bindings/input/touchscreen/zforce_ts.txt
> @@ -11,6 +11,8 @@ Required properties:
> Optional properties:
> - irq-gpios : interrupt gpio the chip is connected to
> - vdd-supply: Regulator controlling the controller supply
> +- scan-idle-hz: idle scanning frequency in Hz (0 - 65535 Hz; default 10 Hz)
> +- scan-active-hz: touch scanning frequeny in Hz (0 - 65535 Hz; default 50 Hz)
>
> Example:
>
> @@ -28,6 +30,8 @@ Example:
>
> x-size = <800>;
> y-size = <600>;
> + scan-idle-hz = <50>;
> + scan-active-hz = <250>;
Since you are using of_property_read_u16() to fetch this data you need
to specify size in dts. But I think DT folks prefer we use
of_property_read_u32() and validate the range instead. Rob?
Thanks.
> };
>
> /* ... */
> diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
> index c912a0b..2e489fd 100644
> --- a/drivers/input/touchscreen/zforce_ts.c
> +++ b/drivers/input/touchscreen/zforce_ts.c
> @@ -87,6 +87,9 @@
>
> #define SETCONFIG_DUALTOUCH (1 << 0)
>
> +#define SCAN_FREQ_DEFAULT_IDLE 10
> +#define SCAN_FREQ_DEFAULT_FINGER 50
> +
> struct zforce_point {
> int coord_x;
> int coord_y;
> @@ -304,7 +307,9 @@ static int zforce_start(struct zforce_ts *ts)
> goto error;
> }
>
> - ret = zforce_scan_frequency(ts, 10, 50, 50);
> + ret = zforce_scan_frequency(ts, pdata->scan_freq_idle,
> + pdata->scan_freq_finger,
> + pdata->scan_freq_finger);
> if (ret) {
> dev_err(&client->dev, "Unable to set scan frequency, %d\n",
> ret);
> @@ -838,6 +843,14 @@ static struct zforce_ts_platdata *zforce_parse_dt(struct device *dev)
> return ERR_PTR(-EINVAL);
> }
>
> + if (of_property_read_u16(np, "scan-idle-hz",
> + &pdata->scan_freq_idle))
> + pdata->scan_freq_idle = SCAN_FREQ_DEFAULT_IDLE;
> +
> + if (of_property_read_u16(np, "scan-active-hz",
> + &pdata->scan_freq_finger))
> + pdata->scan_freq_finger = SCAN_FREQ_DEFAULT_FINGER;
> +
> return pdata;
> }
>
> diff --git a/include/linux/platform_data/zforce_ts.h b/include/linux/platform_data/zforce_ts.h
> index 7bdece8..90a1181 100644
> --- a/include/linux/platform_data/zforce_ts.h
> +++ b/include/linux/platform_data/zforce_ts.h
> @@ -18,6 +18,8 @@
> struct zforce_ts_platdata {
> unsigned int x_max;
> unsigned int y_max;
> + u16 scan_freq_idle;
> + u16 scan_freq_finger;
> };
>
> #endif /* _LINUX_INPUT_ZFORCE_TS_H */
> --
> 1.9.1
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
