Re: [PATCH 04/11] Input: synaptics-rmi4 - fix LTS handling in F01

[Christopher Heiny]

On 02/12/2014 09:27 PM, Dmitry Torokhov wrote:
> From: Christopher Heiny <cheiny@xxxxxxxxxxxxx>
>
> Both F01_RMI_Ctrl2 and F01_RMI_Ctrl3 (doze_interval and wakeup_threshold)
> are controlled by the has_adjustable_doze bit.
>
> Signed-off-by: Christopher Heiny<cheiny@xxxxxxxxxxxxx>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>

Not sure if this need an Ack, but just in case.

Acked-by: Christopher Heiny <cheiny@xxxxxxxxxxxxx>

> ---
>   drivers/input/rmi4/rmi_f01.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c
> index 976aba3..30e0b50 100644
> --- a/drivers/input/rmi4/rmi_f01.c
> +++ b/drivers/input/rmi4/rmi_f01.c
> @@ -328,6 +328,9 @@ static int rmi_f01_initialize(struct rmi_function *fn)
>   		}
>   	}
>
> +	if (data->properties.has_lts)
> +		ctrl_base_addr++;
> +
>   	if (data->properties.has_adjustable_doze_holdoff) {
>   		data->doze_holdoff_addr = ctrl_base_addr;
>   		ctrl_base_addr++;
> @@ -383,7 +386,7 @@ static int rmi_f01_config(struct rmi_function *fn)
>   		dev_err(&fn->dev, "Failed to write interrupt enable.\n");
>   		return retval;
>   	}
> -	if (data->properties.has_lts) {
> +	if (data->properties.has_adjustable_doze) {
>   		retval = rmi_write_block(fn->rmi_dev, data->doze_interval_addr,
>   					 &data->device_control.doze_interval,
>   					 sizeof(u8));
> @@ -391,9 +394,7 @@ static int rmi_f01_config(struct rmi_function *fn)
>   			dev_err(&fn->dev, "Failed to write doze interval.\n");
>   			return retval;
>   		}
> -	}
>
> -	if (data->properties.has_adjustable_doze) {
>   		retval = rmi_write_block(fn->rmi_dev,
>   					 data->wakeup_threshold_addr,
>   					 &data->device_control.wakeup_threshold,


--

Christopher Heiny
Senior Staff Firmware Engineer
Synaptics Incorporated
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/