summaryrefslogtreecommitdiff
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2013-02-06 21:17:24 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 12:57:33 -0700
commit396f8d2dd3291a1329ef9cc05183b234b0d61832 (patch)
tree86d965e0eb731ff23e5cd077f34f98da35eec9c9 /drivers/hwmon
parentc5989c35aaf290ca52f98f22b6d0a09d423b9f13 (diff)
hwmon: ina230: use correct configuration modes
Bug 1228591 Change-Id: I5a4b2b59d32118d57ee0ff6c21b8423268fc1926 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/197993 (cherry picked from commit 2b1e73a6f01c1bf14d4e9c7c493a83ae97b593f3) Reviewed-on: http://git-master/r/199985 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/ina230.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/ina230.c b/drivers/hwmon/ina230.c
index 6700285f73d9..58cfab6743e2 100644
--- a/drivers/hwmon/ina230.c
+++ b/drivers/hwmon/ina230.c
@@ -3,7 +3,7 @@
* (also compatible with TI INA226)
*
*
- * Copyright (c) 2011, NVIDIA Corporation.
+ * Copyright (c) 2011-2013, NVIDIA Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -71,11 +71,11 @@ rst|- - - |AVG |Vbus_CT |Vsh_CT |MODE
#define INA230_VSH_CT (0 << 3) /* Vshunt 140us conversion time */
#if MEASURE_BUS_VOLT
-#define INA230_CONT_MODE 5 /* Continuous Shunt measurement */
-#define INA230_TRIG_MODE 1 /* Triggered Shunt measurement */
-#else
#define INA230_CONT_MODE 7 /* Continuous Bus and shunt measure */
#define INA230_TRIG_MODE 3 /* Triggered Bus and shunt measure */
+#else
+#define INA230_CONT_MODE 5 /* Continuous Shunt measurement */
+#define INA230_TRIG_MODE 1 /* Triggered Shunt measurement */
#endif
#define INA230_POWER_DOWN 0