aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKalle Komierowski <karl.komierowski@gmail.com>2011-03-03 13:10:29 +0100
committerHenrik Öhman <henrik.ohman@stericsson.com>2011-03-15 14:22:56 +0100
commit95564202d60e489e1a494acfb47de2730e153def (patch)
treec6fdd80bdcaf3c67ec2c1518ad559a57d9117d23 /include
parent98a6f2d9459911dd8f8b9fb90e6a434a41cca17e (diff)
mfd: ab8500_gpadc: Added manual batt temp activation for AB8500 3.0
In AB8500 3.0 the pull-up supplying the NTC must be manually activated ST-Ericsson ID: - Change-Id: I88513cff4e064db83f755676468ec0ee44c19c40 Signed-off-by: Kalle Komierowski <karl.komierowski@gmail.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/17511 Tested-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com> Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: Daniel WILLERUD <daniel.willerud@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/ab8500/ab8500-bm.h5
-rw-r--r--include/linux/mfd/abx500.h7
2 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/mfd/ab8500/ab8500-bm.h b/include/linux/mfd/ab8500/ab8500-bm.h
index 2a9f97fdfa0..aacba93b912 100644
--- a/include/linux/mfd/ab8500/ab8500-bm.h
+++ b/include/linux/mfd/ab8500/ab8500-bm.h
@@ -118,11 +118,6 @@
#define ADC_CH_BKBAT_MIN 0
#define ADC_CH_BKBAT_MAX 3200
-/* AB8500 CIDs*/
-#define AB8500_CUT1P0 0x10
-#define AB8500_CUT1P1 0x11
-#define AB8500_CUT2P0 0x20
-
/* Main charge i/p current */
#define MAIN_CH_IP_CUR_0P9A 0x80
#define MAIN_CH_IP_CUR_1P0A 0x90
diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
index e9840a2b0af..f4e405d8c41 100644
--- a/include/linux/mfd/abx500.h
+++ b/include/linux/mfd/abx500.h
@@ -34,6 +34,13 @@
#define AB5500_1_1 0x21
#define AB5500_2_0 0x24
+/* AB8500 CIDs*/
+#define AB8500_CUTEARLY 0x00
+#define AB8500_CUT1P0 0x10
+#define AB8500_CUT1P1 0x11
+#define AB8500_CUT2P0 0x20
+#define AB8500_CUT3P0 0x30
+
/*
* AB3100, EVENTA1, A2 and A3 event register flags
* these are catenated into a single 32-bit flag in the code