Merge remote-tracking branch 'regulator/topic/axp20x' into regulator-next

2017-11-10 21:33:20 +00:00
parent 46294d669c ad92ceaf35
commit 28c426c7ad
2 changed files with 91 additions and 4 deletions
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -131,6 +131,9 @@ enum axp20x_variants {
 #define AXP803_DCDC6_V_OUT		0x25
 #define AXP803_DCDC_FREQ_CTRL		0x3b

+/* Other DCDC regulator control registers are the same as AXP803 */
+#define AXP813_DCDC7_V_OUT		0x26
+
 /* Interrupt */
 #define AXP152_IRQ1_EN			0x40
 #define AXP152_IRQ2_EN			0x41