Re: [PATCH 3/5] input/cma3000_d0x: Keep configuration on poweroff
From: Jonathan Cameron <hidden>
Date: 2011-10-18 08:35:18
Also in:
lkml
On 10/18/11 09:28, Ricardo Ribalda Delgado wrote:
When the device goes to poweroff keep the spi/i2c configuration. Otherwhise the device could not wake up if it was in spi mode.
Run checkpatch.pl over these
quoted hunk
Signed-off-by: Ricardo Ribalda Delgado <redacted> --- drivers/input/misc/cma3000_d0x.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c index 9899742..15577b7 100644 --- a/drivers/input/misc/cma3000_d0x.c +++ b/drivers/input/misc/cma3000_d0x.c@@ -44,6 +44,7 @@ #define CMA3000_RANGE2G (1 << 7) #define CMA3000_RANGE8G (0 << 7) #define CMA3000_BUSI2C (0 << 4) +#define CMA3000_BUSSPI (1 << 4) #define CMA3000_MODEMASK (7 << 1) #define CMA3000_GRANGEMASK (1 << 7)@@ -230,8 +231,11 @@ static int cma3000_poweron(struct cma3000_accl_data *data) static int cma3000_poweroff(struct cma3000_accl_data *data) { int ret; + u8 ctrl = CMAMODE_POFF; - ret = CMA3000_SET(data, CMA3000_CTRL, CMAMODE_POFF, "Mode setting"); + ctrl |= data->bus_ops->ctrl_mod; + + ret = CMA3000_SET(data, CMA3000_CTRL , ctrl, "Mode setting");
no space before comma.
msleep(CMA3000_SETDELAY); return ret;