summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorJajambo Liao <jajambol@nvidia.com>2014-05-21 12:23:37 +0800
committerRiham Haidar <rhaidar@nvidia.com>2014-05-27 14:23:05 -0700
commitac4b8fc1b5c1a676879c3f322cb27f69fd81be82 (patch)
tree0b6e56750dccf0840bb686360ccbe6285275170e /drivers/input
parente1470d63d7f3faa76bc85e8c55822e5835f8f9a7 (diff)
input: misc: compass: set AK8975 single mode only
Bug 1512000 - always set AK8975 in single mode. Change-Id: I815c1270306cc60adc8b48611fb77c432761bca1 Signed-off-by: Jajambo Liao <jajambol@nvidia.com> Reviewed-on: http://git-master/r/412452 (cherry picked from commit 13e8d606575ae8df0bc5a17ed59edc8f29ea4b16) Reviewed-on: http://git-master/r/414833 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Jordan Nien <jnien@nvidia.com> Reviewed-by: Tony Hsiao <thsiao@nvidia.com> Reviewed-by: Mitch Luban <mluban@nvidia.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/compass/ak8975_input.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/input/misc/compass/ak8975_input.c b/drivers/input/misc/compass/ak8975_input.c
index 753a4cf2c1fc..d92d02c07639 100644
--- a/drivers/input/misc/compass/ak8975_input.c
+++ b/drivers/input/misc/compass/ak8975_input.c
@@ -1,5 +1,5 @@
/* Copyright (C) 2012 Invensense, Inc.
- * Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2013-2014, NVIDIA CORPORATION. All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -504,10 +504,7 @@ static int akm_delay(struct akm_inf *inf, unsigned int delay_us)
(unsigned int)delay_us);
if (!err) {
if (inf->dev_id == COMPASS_ID_AK8963) {
- if (delay_us == (AKM_INPUT_DELAY_MS_MIN * 1000))
- mode = AKM_CNTL1_MODE_CONT2;
- else
- mode = AKM_CNTL1_MODE_SINGLE;
+ mode = AKM_CNTL1_MODE_SINGLE;
err = akm_mode_wr(inf, false, inf->range_i, mode);
}
}