Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752066AbaBMTcm (ORCPT ); Thu, 13 Feb 2014 14:32:42 -0500 Received: from us-mx2.synaptics.com ([192.147.44.131]:32596 "EHLO us-mx2.synaptics.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751937AbaBMTce (ORCPT ); Thu, 13 Feb 2014 14:32:34 -0500 X-PGP-Universal: processed; by securemail.synaptics.com on Thu, 13 Feb 2014 11:19:52 -0800 Message-ID: <52FD1DCE.2040005@synaptics.com> Date: Thu, 13 Feb 2014 11:32:30 -0800 From: Christopher Heiny Organization: Synaptics, Inc User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Dmitry Torokhov CC: Andrew Duggan , Vincent Huang , Vivian Ly , Daniel Rosenberg , Linus Walleij , Benjamin Tissoires , Courtney Cavin , Linux Input , Linux Kernel Subject: Re: [PATCH 04/11] Input: synaptics-rmi4 - fix LTS handling in F01 References: <1392269277-16391-1-git-send-email-dmitry.torokhov@gmail.com> <1392269277-16391-4-git-send-email-dmitry.torokhov@gmail.com> In-Reply-To: <1392269277-16391-4-git-send-email-dmitry.torokhov@gmail.com> X-Originating-IP: [10.3.20.103] X-Brightmail-Tracker: AAAAAQAAAWE= Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/12/2014 09:27 PM, Dmitry Torokhov wrote: > From: Christopher Heiny > > 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 > Signed-off-by: Dmitry Torokhov Not sure if this need an Ack, but just in case. Acked-by: Christopher Heiny > --- > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/