1 files changed, 55 insertions, 18 deletions

diff --git a/include/linux/mfd/tps65090.h b/include/linux/mfd/tps65090.h
index 804e280c1e1..6694cf43e8b 100644
--- a/include/linux/mfd/tps65090.h
+++ b/include/linux/mfd/tps65090.h
@@ -23,6 +23,26 @@
 #define __LINUX_MFD_TPS65090_H
 
 #include <linux/irq.h>
+#include <linux/regmap.h>
+
+/* TPS65090 IRQs */
+enum {
+        TPS65090_IRQ_VAC_STATUS_CHANGE,
+        TPS65090_IRQ_VSYS_STATUS_CHANGE,
+        TPS65090_IRQ_BAT_STATUS_CHANGE,
+        TPS65090_IRQ_CHARGING_STATUS_CHANGE,
+        TPS65090_IRQ_CHARGING_COMPLETE,
+        TPS65090_IRQ_OVERLOAD_DCDC1,
+        TPS65090_IRQ_OVERLOAD_DCDC2,
+        TPS65090_IRQ_OVERLOAD_DCDC3,
+        TPS65090_IRQ_OVERLOAD_FET1,
+        TPS65090_IRQ_OVERLOAD_FET2,
+        TPS65090_IRQ_OVERLOAD_FET3,
+        TPS65090_IRQ_OVERLOAD_FET4,
+        TPS65090_IRQ_OVERLOAD_FET5,
+        TPS65090_IRQ_OVERLOAD_FET6,
+        TPS65090_IRQ_OVERLOAD_FET7,
+};
 
 /* TPS65090 Regulator ID */
 enum {
@@ -44,20 +64,9 @@ enum {
 };
 
 struct tps65090 {
-        struct mutex            lock;
         struct device           *dev;
-        struct i2c_client       *client;
         struct regmap           *rmap;
-        struct irq_chip         irq_chip;
-        struct mutex            irq_lock;
-        int                     irq_base;
-        unsigned int            id;
-};
-
-struct tps65090_subdev_info {
-        int             id;
-        const char      *name;
-        void            *platform_data;
+        struct regmap_irq_chip_data *irq_data;
 };
 
 /*
@@ -77,8 +86,6 @@ struct tps65090_regulator_plat_data {
 
 struct tps65090_platform_data {
         int irq_base;
-        int num_subdevs;
-        struct tps65090_subdev_info *subdevs;
         struct tps65090_regulator_plat_data *reg_pdata[TPS65090_REGULATOR_MAX];
 };
 
@@ -86,9 +93,39 @@ struct tps65090_platform_data {
  * NOTE: the functions below are not intended for use outside
  * of the TPS65090 sub-device drivers
  */
-extern int tps65090_write(struct device *dev, int reg, uint8_t val);
-extern int tps65090_read(struct device *dev, int reg, uint8_t *val);
-extern int tps65090_set_bits(struct device *dev, int reg, uint8_t bit_num);
-extern int tps65090_clr_bits(struct device *dev, int reg, uint8_t bit_num);
+static inline int tps65090_write(struct device *dev, int reg, uint8_t val)
+{
+        struct tps65090 *tps = dev_get_drvdata(dev);
+
+        return regmap_write(tps->rmap, reg, val);
+}
+
+static inline int tps65090_read(struct device *dev, int reg, uint8_t *val)
+{
+        struct tps65090 *tps = dev_get_drvdata(dev);
+        unsigned int temp_val;
+        int ret;
+
+        ret = regmap_read(tps->rmap, reg, &temp_val);
+        if (!ret)
+                *val = temp_val;
+        return ret;
+}
+
+static inline int tps65090_set_bits(struct device *dev, int reg,
+                uint8_t bit_num)
+{
+        struct tps65090 *tps = dev_get_drvdata(dev);
+
+        return regmap_update_bits(tps->rmap, reg, BIT(bit_num), ~0u);
+}
+
+static inline int tps65090_clr_bits(struct device *dev, int reg,
+                uint8_t bit_num)
+{
+        struct tps65090 *tps = dev_get_drvdata(dev);
+
+        return regmap_update_bits(tps->rmap, reg, BIT(bit_num), 0u);
+}
 
 #endif /*__LINUX_MFD_TPS65090_H */