Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

[mirror_ubuntu-bionic-kernel.git] / include / linux / mfd / mc13xxx.h

diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
index a98e2a316d1f2e4235cc628e52b44058112ab976..b86ee45c8b03fc1b57f233543bbd0f0859167532 100644 (file)
--- a/include/linux/mfd/mc13xxx.h
+++ b/include/linux/mfd/mc13xxx.h
@@ -174,6 +174,9 @@ struct mc13xxx_platform_data {
 #define MC13XXX_ADC_MODE_MULT_CHAN     3
 
 #define MC13XXX_ADC0           43
+#define MC13XXX_ADC0_LICELLCON         (1 << 0)
+#define MC13XXX_ADC0_CHRGICON          (1 << 1)
+#define MC13XXX_ADC0_BATICON           (1 << 2)
 #define MC13XXX_ADC0_ADREFEN           (1 << 10)
 #define MC13XXX_ADC0_TSMOD0            (1 << 12)
 #define MC13XXX_ADC0_TSMOD1            (1 << 13)
@@ -185,4 +188,9 @@ struct mc13xxx_platform_data {
                                        MC13XXX_ADC0_TSMOD1 | \
                                        MC13XXX_ADC0_TSMOD2)
 
+#define MC13XXX_ADC0_CONFIG_MASK       (MC13XXX_ADC0_TSMOD_MASK | \
+                                       MC13XXX_ADC0_LICELLCON | \
+                                       MC13XXX_ADC0_CHRGICON | \
+                                       MC13XXX_ADC0_BATICON)
+
 #endif /* ifndef __LINUX_MFD_MC13XXX_H */