From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: rdunlap@xenotime.net, dmitry.torokhov@gmail.com,
grant.likely@secretlab.ca, ricardo.ribalda@gmail.com,
jic23@cam.ac.uk, aghayal@codeaurora.org, sameo@linux.intel.com,
peter.ujfalusi@ti.com, alan@linux.intel.com, david@hardeman.nu,
Shubhrajyoti@ti.com, saaguirre@ti.com, hemanthv@ti.com,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-input@vger.kernel.org, devicetree-discuss@lists.ozlabs.org
Subject: [PATCHv6_input/next 3/5] input/cma3000_d0x: Keep configuration on poweroff
Date: Wed, 9 Nov 2011 22:37:30 +0100 [thread overview]
Message-ID: <1320874652-18371-4-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1320874652-18371-1-git-send-email-ricardo.ribalda@gmail.com>
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@gmail.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 97e36fa..35d2577 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.2
next prev parent reply other threads:[~2011-11-09 21:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-09 21:37 [PATCHv6_input/next 0/5] Add spi support for CMA3000 driver Ricardo Ribalda Delgado
2011-11-09 21:37 ` [PATCHv6_input/next 1/5] input/cma3000_d0x: Support devices without pdata Ricardo Ribalda Delgado
2011-11-09 21:37 ` [PATCHv6_input/next 2/5] input/cma3000_d0x: Check silicon version Ricardo Ribalda Delgado
2011-11-09 21:37 ` Ricardo Ribalda Delgado [this message]
2011-11-09 21:37 ` [PATCHv6_input/next 4/5] input/cma3000_d0x: Add CMA3000 spi support Ricardo Ribalda Delgado
2011-11-10 9:50 ` Shubhrajyoti
2011-11-09 21:37 ` [PATCHv6_input/next 5/5] input/cma3000_d0x: Match comment to name of struct Ricardo Ribalda Delgado
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320874652-18371-4-git-send-email-ricardo.ribalda@gmail.com \
--to=ricardo.ribalda@gmail.com \
--cc=Shubhrajyoti@ti.com \
--cc=aghayal@codeaurora.org \
--cc=alan@linux.intel.com \
--cc=david@hardeman.nu \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=dmitry.torokhov@gmail.com \
--cc=grant.likely@secretlab.ca \
--cc=hemanthv@ti.com \
--cc=jic23@cam.ac.uk \
--cc=linux-doc@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.ujfalusi@ti.com \
--cc=rdunlap@xenotime.net \
--cc=saaguirre@ti.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®