mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
To: dmitry.torokhov@gmail.com, sameo@linux.intel.com,
	peter.ujfalusi@ti.com, aghayal@codeaurora.org, david@hardeman.nu,
	Shubhrajyoti@ti.com, saaguirre@ti.com, jic23@cam.ac.uk,
	hemanthv@ti.com, linux-input@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Subject: [PATCHv2 3/7] input/cma3000_d0x: Keep configuration on poweroff
Date: Tue, 18 Oct 2011 14:06:32 +0200	[thread overview]
Message-ID: <1318939596-27330-4-git-send-email-ricardo.ribalda@gmail.com> (raw)
In-Reply-To: <1318939596-27330-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 3877cbe..e1d27d0 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");
 	msleep(CMA3000_SETDELAY);
 
 	return ret;
-- 
1.7.7


  parent reply	other threads:[~2011-10-18 12:06 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-18 12:06 [PATCHv2 0/7] Add spi support for CMA3000 driver and new driver CMR3000 Ricardo Ribalda Delgado
2011-10-18 12:06 ` [PATCHv2 1/7] input/cma3000_d0x: Support devices without pdata Ricardo Ribalda Delgado
2011-10-18 12:53   ` Jonathan Cameron
2011-10-18 12:58     ` Ricardo Ribalda Delgado
2011-10-18 13:45       ` Jonathan Cameron
2011-10-18 12:06 ` [PATCHv2 2/7] input/cma3000_d0x: Check silicon version Ricardo Ribalda Delgado
2011-10-18 12:54   ` Jonathan Cameron
2011-10-18 12:06 ` Ricardo Ribalda Delgado [this message]
2011-10-18 12:06 ` [PATCHv2 4/7] input/cma3000_d0x: Add CMA3000 spi support Ricardo Ribalda Delgado
2011-10-18 13:14   ` Jonathan Cameron
2011-10-18 13:43     ` Ricardo Ribalda Delgado
2011-10-18 13:50       ` Jonathan Cameron
2011-10-18 15:18         ` Ricardo Ribalda Delgado
2011-10-18 15:27           ` Jonathan Cameron
2011-10-18 15:50             ` Ricardo Ribalda Delgado
2011-10-18 12:06 ` [PATCHv2 5/7] Input: add CMR3000 gyrsocope driver Ricardo Ribalda Delgado
2011-10-18 12:06 ` [PATCHv2 6/7] input/cma3000_d0x: Unwind reverse order of init Ricardo Ribalda Delgado
2011-10-18 13:15   ` Jonathan Cameron
2011-10-18 12:06 ` [PATCHv2 7/7] input/cma3000_d0x: Match comment to name of struct Ricardo Ribalda Delgado
2011-10-18 13:16   ` Jonathan Cameron

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=1318939596-27330-4-git-send-email-ricardo.ribalda@gmail.com \
    --to=ricardo.ribalda@gmail.com \
    --cc=Shubhrajyoti@ti.com \
    --cc=aghayal@codeaurora.org \
    --cc=david@hardeman.nu \
    --cc=dmitry.torokhov@gmail.com \
    --cc=hemanthv@ti.com \
    --cc=jic23@cam.ac.uk \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=peter.ujfalusi@ti.com \
    --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®