[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1318952886-835-4-git-send-email-ricardo.ribalda@gmail.com>
Date: Tue, 18 Oct 2011 17:48:02 +0200
From: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com>
To: dmitry.torokhov@...il.com, sameo@...ux.intel.com,
peter.ujfalusi@...com, aghayal@...eaurora.org, david@...deman.nu,
Shubhrajyoti@...com, saaguirre@...com, jic23@....ac.uk,
hemanthv@...com, linux-input@...r.kernel.org,
linux-kernel@...r.kernel.org
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com>
Subject: [PATCHv3 3/7] input/cma3000_d0x: Keep configuration on poweroff
When the device goes to poweroff keep the spi/i2c configuration.
Otherwhise the device could not wake up if it was in spi mode.
---
v2: Fixes suggested by Jonathan Cameron
-Code Style
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@...il.com>
---
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 18ac912..bbda34c 100644
--- a/drivers/input/misc/cma3000_d0x.c
+++ b/drivers/input/misc/cma3000_d0x.c
@@ -45,6 +45,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)
@@ -231,8 +232,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");
msleep(CMA3000_SETDELAY);
return ret;
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists