Merge tag 'mfd-for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[karo-tx-linux.git] / include / linux / mfd / axp20x.h

diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index f848ee86a339bf37d662459b1443edbd8580e968..0d9a1ff383933e375dedf820f7ba5ef7d55494c7 100644 (file)
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -235,10 +235,20 @@ enum axp20x_variants {
 #define AXP22X_BATLOW_THRES1           0xe6
 
 /* AXP288 specific registers */
+#define AXP288_POWER_REASON            0x02
+#define AXP288_BC_GLOBAL               0x2c
+#define AXP288_BC_VBUS_CNTL            0x2d
+#define AXP288_BC_USB_STAT             0x2e
+#define AXP288_BC_DET_STAT             0x2f
 #define AXP288_PMIC_ADC_H               0x56
 #define AXP288_PMIC_ADC_L               0x57
+#define AXP288_TS_ADC_H                        0x58
+#define AXP288_TS_ADC_L                        0x59
+#define AXP288_GP_ADC_H                        0x5a
+#define AXP288_GP_ADC_L                        0x5b
 #define AXP288_ADC_TS_PIN_CTRL          0x84
-#define AXP288_PMIC_ADC_EN              0x84
+#define AXP288_RT_BATT_V_H             0xa0
+#define AXP288_RT_BATT_V_L             0xa1
 
 /* Fuel Gauge */
 #define AXP288_FG_RDC1_REG          0xba
@@ -515,14 +525,10 @@ enum axp809_irqs {
        AXP809_IRQ_GPIO0_INPUT,
 };
 
-#define AXP288_TS_ADC_H                0x58
-#define AXP288_TS_ADC_L                0x59
-#define AXP288_GP_ADC_H                0x5a
-#define AXP288_GP_ADC_L                0x5b
-
 struct axp20x_dev {
        struct device                   *dev;
        int                             irq;
+       unsigned long                   irq_flags;
        struct regmap                   *regmap;
        struct regmap_irq_chip_data     *regmap_irqc;
        long                            variant;
@@ -582,7 +588,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x);
 int axp20x_device_probe(struct axp20x_dev *axp20x);
 
 /**
- * axp20x_device_probe(): Remove a axp20x device
+ * axp20x_device_remove(): Remove a axp20x device
  *
  * @axp20x: axp20x device to remove
  *