summaryrefslogtreecommitdiff
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-17 15:21:09 +0300
committerMark Brown <broonie@kernel.org>2015-03-17 15:21:09 +0300
commita26aeb177d8c1c4df3e32f0a21e8dd5b45ab1fc1 (patch)
tree5ed97aefa2b24b89e033dd403d6a0865fb7ae202 /include/linux/mfd
parentcdbf6f0e8e58ec4601546d0ab67da905d4a2e6f5 (diff)
parente03826d5045e81a66a4fad7be9a8ecdaeb7911cf (diff)
downloadlinux-a26aeb177d8c1c4df3e32f0a21e8dd5b45ab1fc1.tar.xz
Merge branch 'fix/palmas' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-palmas
Diffstat (limited to 'include/linux/mfd')
-rw-r--r--include/linux/mfd/palmas.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index fb0390a1a498..ee7b1ce7a6f8 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -2999,6 +2999,9 @@ enum usb_irq_events {
#define PALMAS_GPADC_TRIM15 0x0E
#define PALMAS_GPADC_TRIM16 0x0F
+/* TPS659038 regen2_ctrl offset iss different from palmas */
+#define TPS659038_REGEN2_CTRL 0x12
+
/* TPS65917 Interrupt registers */
/* Registers for function INTERRUPT */