mfd: tps80031: Remove driver
authorDmitry Osipenko <digetx@gmail.com>
Thu, 21 Oct 2021 19:22:58 +0000 (22:22 +0300)
committerLee Jones <lee.jones@linaro.org>
Fri, 5 Nov 2021 14:40:28 +0000 (14:40 +0000)
Driver was upstreamed in 2013 and never got a user, remove it.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20211021192258.21968-4-digetx@gmail.com
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/tps80031.c [deleted file]
include/linux/mfd/tps80031.h [deleted file]

index f99334f..bc75156 100644 (file)
@@ -1624,20 +1624,6 @@ config MFD_TPS65912_SPI
          If you say yes here you get support for the TPS65912 series of
          PM chips with SPI interface.
 
-config MFD_TPS80031
-       bool "TI TPS80031/TPS80032 Power Management chips"
-       depends on I2C=y
-       select MFD_CORE
-       select REGMAP_I2C
-       select REGMAP_IRQ
-       help
-         If you say yes here you get support for the Texas Instruments
-         TPS80031/ TPS80032 Fully Integrated Power Management with Power
-         Path and Battery Charger. The device provides five configurable
-         step-down converters, 11 general purpose LDOs, USB OTG Module,
-         ADC, RTC, 2 PWM, System Voltage Regulator/Battery Charger with
-         Power Path from USB, 32K clock generator.
-
 config TWL4030_CORE
        bool "TI TWL4030/TWL5030/TWL6030/TPS659x0 Support"
        depends on I2C=y
index 2ba6646..0b1b629 100644 (file)
@@ -105,7 +105,6 @@ obj-$(CONFIG_MFD_TPS65910)  += tps65910.o
 obj-$(CONFIG_MFD_TPS65912)     += tps65912-core.o
 obj-$(CONFIG_MFD_TPS65912_I2C) += tps65912-i2c.o
 obj-$(CONFIG_MFD_TPS65912_SPI)  += tps65912-spi.o
-obj-$(CONFIG_MFD_TPS80031)     += tps80031.o
 obj-$(CONFIG_MENELAUS)         += menelaus.o
 
 obj-$(CONFIG_TWL4030_CORE)     += twl-core.o twl4030-irq.o twl6030-irq.o
diff --git a/drivers/mfd/tps80031.c b/drivers/mfd/tps80031.c
deleted file mode 100644 (file)
index 3c4e62c..0000000
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
- * tps80031.c -- TI TPS80031/TPS80032 mfd core driver.
- *
- * MFD core driver for TI TPS80031/TPS80032 Fully Integrated
- * Power Management with Power Path and Battery Charger
- *
- * Copyright (c) 2012, NVIDIA Corporation.
- *
- * Author: Laxman Dewangan <ldewangan@nvidia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
- * whether express or implied; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA
- */
-
-#include <linux/err.h>
-#include <linux/i2c.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/tps80031.h>
-#include <linux/pm.h>
-#include <linux/regmap.h>
-#include <linux/slab.h>
-
-static const struct resource tps80031_rtc_resources[] = {
-       DEFINE_RES_IRQ(TPS80031_INT_RTC_ALARM),
-};
-
-/* TPS80031 sub mfd devices */
-static const struct mfd_cell tps80031_cell[] = {
-       {
-               .name = "tps80031-pmic",
-       },
-       {
-               .name = "tps80031-clock",
-       },
-       {
-               .name = "tps80031-rtc",
-               .num_resources = ARRAY_SIZE(tps80031_rtc_resources),
-               .resources = tps80031_rtc_resources,
-       },
-       {
-               .name = "tps80031-gpadc",
-       },
-       {
-               .name = "tps80031-fuel-gauge",
-       },
-       {
-               .name = "tps80031-charger",
-       },
-};
-
-static int tps80031_slave_address[TPS80031_NUM_SLAVES] = {
-       TPS80031_I2C_ID0_ADDR,
-       TPS80031_I2C_ID1_ADDR,
-       TPS80031_I2C_ID2_ADDR,
-       TPS80031_I2C_ID3_ADDR,
-};
-
-struct tps80031_pupd_data {
-       u8      reg;
-       u8      pullup_bit;
-       u8      pulldown_bit;
-};
-
-#define TPS80031_IRQ(_reg, _mask)                      \
-       {                                                       \
-               .reg_offset = (TPS80031_INT_MSK_LINE_##_reg) -  \
-                               TPS80031_INT_MSK_LINE_A,        \
-               .mask = BIT(_mask),                             \
-       }
-
-static const struct regmap_irq tps80031_main_irqs[] = {
-       [TPS80031_INT_PWRON]            = TPS80031_IRQ(A, 0),
-       [TPS80031_INT_RPWRON]           = TPS80031_IRQ(A, 1),
-       [TPS80031_INT_SYS_VLOW]         = TPS80031_IRQ(A, 2),
-       [TPS80031_INT_RTC_ALARM]        = TPS80031_IRQ(A, 3),
-       [TPS80031_INT_RTC_PERIOD]       = TPS80031_IRQ(A, 4),
-       [TPS80031_INT_HOT_DIE]          = TPS80031_IRQ(A, 5),
-       [TPS80031_INT_VXX_SHORT]        = TPS80031_IRQ(A, 6),
-       [TPS80031_INT_SPDURATION]       = TPS80031_IRQ(A, 7),
-       [TPS80031_INT_WATCHDOG]         = TPS80031_IRQ(B, 0),
-       [TPS80031_INT_BAT]              = TPS80031_IRQ(B, 1),
-       [TPS80031_INT_SIM]              = TPS80031_IRQ(B, 2),
-       [TPS80031_INT_MMC]              = TPS80031_IRQ(B, 3),
-       [TPS80031_INT_RES]              = TPS80031_IRQ(B, 4),
-       [TPS80031_INT_GPADC_RT]         = TPS80031_IRQ(B, 5),
-       [TPS80031_INT_GPADC_SW2_EOC]    = TPS80031_IRQ(B, 6),
-       [TPS80031_INT_CC_AUTOCAL]       = TPS80031_IRQ(B, 7),
-       [TPS80031_INT_ID_WKUP]          = TPS80031_IRQ(C, 0),
-       [TPS80031_INT_VBUSS_WKUP]       = TPS80031_IRQ(C, 1),
-       [TPS80031_INT_ID]               = TPS80031_IRQ(C, 2),
-       [TPS80031_INT_VBUS]             = TPS80031_IRQ(C, 3),
-       [TPS80031_INT_CHRG_CTRL]        = TPS80031_IRQ(C, 4),
-       [TPS80031_INT_EXT_CHRG]         = TPS80031_IRQ(C, 5),
-       [TPS80031_INT_INT_CHRG]         = TPS80031_IRQ(C, 6),
-       [TPS80031_INT_RES2]             = TPS80031_IRQ(C, 7),
-};
-
-static struct regmap_irq_chip tps80031_irq_chip = {
-       .name = "tps80031",
-       .irqs = tps80031_main_irqs,
-       .num_irqs = ARRAY_SIZE(tps80031_main_irqs),
-       .num_regs = 3,
-       .status_base = TPS80031_INT_STS_A,
-       .mask_base = TPS80031_INT_MSK_LINE_A,
-};
-
-#define PUPD_DATA(_reg, _pulldown_bit, _pullup_bit)    \
-       {                                               \
-               .reg = TPS80031_CFG_INPUT_PUPD##_reg,   \
-               .pulldown_bit = _pulldown_bit,          \
-               .pullup_bit = _pullup_bit,              \
-       }
-
-static const struct tps80031_pupd_data tps80031_pupds[] = {
-       [TPS80031_PREQ1]                = PUPD_DATA(1, BIT(0),  BIT(1)),
-       [TPS80031_PREQ2A]               = PUPD_DATA(1, BIT(2),  BIT(3)),
-       [TPS80031_PREQ2B]               = PUPD_DATA(1, BIT(4),  BIT(5)),
-       [TPS80031_PREQ2C]               = PUPD_DATA(1, BIT(6),  BIT(7)),
-       [TPS80031_PREQ3]                = PUPD_DATA(2, BIT(0),  BIT(1)),
-       [TPS80031_NRES_WARM]            = PUPD_DATA(2, 0,       BIT(2)),
-       [TPS80031_PWM_FORCE]            = PUPD_DATA(2, BIT(5),  0),
-       [TPS80031_CHRG_EXT_CHRG_STATZ]  = PUPD_DATA(2, 0,       BIT(6)),
-       [TPS80031_SIM]                  = PUPD_DATA(3, BIT(0),  BIT(1)),
-       [TPS80031_MMC]                  = PUPD_DATA(3, BIT(2),  BIT(3)),
-       [TPS80031_GPADC_START]          = PUPD_DATA(3, BIT(4),  0),
-       [TPS80031_DVSI2C_SCL]           = PUPD_DATA(4, 0,       BIT(0)),
-       [TPS80031_DVSI2C_SDA]           = PUPD_DATA(4, 0,       BIT(1)),
-       [TPS80031_CTLI2C_SCL]           = PUPD_DATA(4, 0,       BIT(2)),
-       [TPS80031_CTLI2C_SDA]           = PUPD_DATA(4, 0,       BIT(3)),
-};
-static struct tps80031 *tps80031_power_off_dev;
-
-int tps80031_ext_power_req_config(struct device *dev,
-               unsigned long ext_ctrl_flag, int preq_bit,
-               int state_reg_add, int trans_reg_add)
-{
-       u8 res_ass_reg = 0;
-       int preq_mask_bit = 0;
-       int ret;
-
-       if (!(ext_ctrl_flag & TPS80031_EXT_PWR_REQ))
-               return 0;
-
-       if (ext_ctrl_flag & TPS80031_PWR_REQ_INPUT_PREQ1) {
-               res_ass_reg = TPS80031_PREQ1_RES_ASS_A + (preq_bit >> 3);
-               preq_mask_bit = 5;
-       } else if (ext_ctrl_flag & TPS80031_PWR_REQ_INPUT_PREQ2) {
-               res_ass_reg = TPS80031_PREQ2_RES_ASS_A + (preq_bit >> 3);
-               preq_mask_bit = 6;
-       } else if (ext_ctrl_flag & TPS80031_PWR_REQ_INPUT_PREQ3) {
-               res_ass_reg = TPS80031_PREQ3_RES_ASS_A + (preq_bit >> 3);
-               preq_mask_bit = 7;
-       }
-
-       /* Configure REQ_ASS registers */
-       ret = tps80031_set_bits(dev, TPS80031_SLAVE_ID1, res_ass_reg,
-                                       BIT(preq_bit & 0x7));
-       if (ret < 0) {
-               dev_err(dev, "reg 0x%02x setbit failed, err = %d\n",
-                               res_ass_reg, ret);
-               return ret;
-       }
-
-       /* Unmask the PREQ */
-       ret = tps80031_clr_bits(dev, TPS80031_SLAVE_ID1,
-                       TPS80031_PHOENIX_MSK_TRANSITION, BIT(preq_mask_bit));
-       if (ret < 0) {
-               dev_err(dev, "reg 0x%02x clrbit failed, err = %d\n",
-                       TPS80031_PHOENIX_MSK_TRANSITION, ret);
-               return ret;
-       }
-
-       /* Switch regulator control to resource now */
-       if (ext_ctrl_flag & (TPS80031_PWR_REQ_INPUT_PREQ2 |
-                                       TPS80031_PWR_REQ_INPUT_PREQ3)) {
-               ret = tps80031_update(dev, TPS80031_SLAVE_ID1, state_reg_add,
-                                               0x0, TPS80031_STATE_MASK);
-               if (ret < 0)
-                       dev_err(dev, "reg 0x%02x update failed, err = %d\n",
-                               state_reg_add, ret);
-       } else {
-               ret = tps80031_update(dev, TPS80031_SLAVE_ID1, trans_reg_add,
-                               TPS80031_TRANS_SLEEP_OFF,
-                               TPS80031_TRANS_SLEEP_MASK);
-               if (ret < 0)
-                       dev_err(dev, "reg 0x%02x update failed, err = %d\n",
-                               trans_reg_add, ret);
-       }
-       return ret;
-}
-EXPORT_SYMBOL_GPL(tps80031_ext_power_req_config);
-
-static void tps80031_power_off(void)
-{
-       dev_info(tps80031_power_off_dev->dev, "switching off PMU\n");
-       tps80031_write(tps80031_power_off_dev->dev, TPS80031_SLAVE_ID1,
-                               TPS80031_PHOENIX_DEV_ON, TPS80031_DEVOFF);
-}
-
-static void tps80031_pupd_init(struct tps80031 *tps80031,
-                              struct tps80031_platform_data *pdata)
-{
-       struct tps80031_pupd_init_data *pupd_init_data = pdata->pupd_init_data;
-       int data_size = pdata->pupd_init_data_size;
-       int i;
-
-       for (i = 0; i < data_size; ++i) {
-               struct tps80031_pupd_init_data *pupd_init = &pupd_init_data[i];
-               const struct tps80031_pupd_data *pupd =
-                       &tps80031_pupds[pupd_init->input_pin];
-               u8 update_value = 0;
-               u8 update_mask = pupd->pulldown_bit | pupd->pullup_bit;
-
-               if (pupd_init->setting == TPS80031_PUPD_PULLDOWN)
-                       update_value = pupd->pulldown_bit;
-               else if (pupd_init->setting == TPS80031_PUPD_PULLUP)
-                       update_value = pupd->pullup_bit;
-
-               tps80031_update(tps80031->dev, TPS80031_SLAVE_ID1, pupd->reg,
-                               update_value, update_mask);
-       }
-}
-
-static int tps80031_init_ext_control(struct tps80031 *tps80031,
-                       struct tps80031_platform_data *pdata)
-{
-       struct device *dev = tps80031->dev;
-       int ret;
-       int i;
-
-       /* Clear all external control for this rail */
-       for (i = 0; i < 9; ++i) {
-               ret = tps80031_write(dev, TPS80031_SLAVE_ID1,
-                               TPS80031_PREQ1_RES_ASS_A + i, 0);
-               if (ret < 0) {
-                       dev_err(dev, "reg 0x%02x write failed, err = %d\n",
-                               TPS80031_PREQ1_RES_ASS_A + i, ret);
-                       return ret;
-               }
-       }
-
-       /* Mask the PREQ */
-       ret = tps80031_set_bits(dev, TPS80031_SLAVE_ID1,
-                       TPS80031_PHOENIX_MSK_TRANSITION, 0x7 << 5);
-       if (ret < 0) {
-               dev_err(dev, "reg 0x%02x set_bits failed, err = %d\n",
-                       TPS80031_PHOENIX_MSK_TRANSITION, ret);
-               return ret;
-       }
-       return ret;
-}
-
-static int tps80031_irq_init(struct tps80031 *tps80031, int irq, int irq_base)
-{
-       struct device *dev = tps80031->dev;
-       int i, ret;
-
-       /*
-        * The MASK register used for updating status register when
-        * interrupt occurs and LINE register used to pass the status
-        * to actual interrupt line.  As per datasheet:
-        * When INT_MSK_LINE [i] is set to 1, the associated interrupt
-        * number i is INT line masked, which means that no interrupt is
-        * generated on the INT line.
-        * When INT_MSK_LINE [i] is set to 0, the associated interrupt
-        * number i is  line enabled: An interrupt is generated on the
-        * INT line.
-        * In any case, the INT_STS [i] status bit may or may not be updated,
-        * only linked to the INT_MSK_STS [i] configuration register bit.
-        *
-        * When INT_MSK_STS [i] is set to 1, the associated interrupt number
-        * i is status masked, which means that no interrupt is stored in
-        * the INT_STS[i] status bit. Note that no interrupt number i is
-        * generated on the INT line, even if the INT_MSK_LINE [i] register
-        * bit is set to 0.
-        * When INT_MSK_STS [i] is set to 0, the associated interrupt number i
-        * is status enabled: An interrupt status is updated in the INT_STS [i]
-        * register. The interrupt may or may not be generated on the INT line,
-        * depending on the INT_MSK_LINE [i] configuration register bit.
-        */
-       for (i = 0; i < 3; i++)
-               tps80031_write(dev, TPS80031_SLAVE_ID2,
-                               TPS80031_INT_MSK_STS_A + i, 0x00);
-
-       ret = regmap_add_irq_chip(tps80031->regmap[TPS80031_SLAVE_ID2], irq,
-                       IRQF_ONESHOT, irq_base,
-                       &tps80031_irq_chip, &tps80031->irq_data);
-       if (ret < 0) {
-               dev_err(dev, "add irq failed, err = %d\n", ret);
-               return ret;
-       }
-       return ret;
-}
-
-static bool rd_wr_reg_id0(struct device *dev, unsigned int reg)
-{
-       switch (reg) {
-       case TPS80031_SMPS1_CFG_FORCE ... TPS80031_SMPS2_CFG_VOLTAGE:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static bool rd_wr_reg_id1(struct device *dev, unsigned int reg)
-{
-       switch (reg) {
-       case TPS80031_SECONDS_REG ... TPS80031_RTC_RESET_STATUS_REG:
-       case TPS80031_VALIDITY0 ... TPS80031_VALIDITY7:
-       case TPS80031_PHOENIX_START_CONDITION ... TPS80031_KEY_PRESS_DUR_CFG:
-       case TPS80031_SMPS4_CFG_TRANS ... TPS80031_SMPS3_CFG_VOLTAGE:
-       case TPS80031_BROADCAST_ADDR_ALL ... TPS80031_BROADCAST_ADDR_CLK_RST:
-       case TPS80031_VANA_CFG_TRANS ... TPS80031_LDO7_CFG_VOLTAGE:
-       case TPS80031_REGEN1_CFG_TRANS ... TPS80031_TMP_CFG_STATE:
-       case TPS80031_PREQ1_RES_ASS_A ... TPS80031_PREQ3_RES_ASS_C:
-       case TPS80031_SMPS_OFFSET ... TPS80031_BATDEBOUNCING:
-       case TPS80031_CFG_INPUT_PUPD1 ... TPS80031_CFG_SMPS_PD:
-       case TPS80031_BACKUP_REG:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static bool is_volatile_reg_id1(struct device *dev, unsigned int reg)
-{
-       switch (reg) {
-       case TPS80031_SMPS4_CFG_TRANS ... TPS80031_SMPS3_CFG_VOLTAGE:
-       case TPS80031_VANA_CFG_TRANS ... TPS80031_LDO7_CFG_VOLTAGE:
-       case TPS80031_REGEN1_CFG_TRANS ... TPS80031_TMP_CFG_STATE:
-       case TPS80031_PREQ1_RES_ASS_A ... TPS80031_PREQ3_RES_ASS_C:
-       case TPS80031_SMPS_OFFSET ... TPS80031_BATDEBOUNCING:
-       case TPS80031_CFG_INPUT_PUPD1 ... TPS80031_CFG_SMPS_PD:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static bool rd_wr_reg_id2(struct device *dev, unsigned int reg)
-{
-       switch (reg) {
-       case TPS80031_USB_VENDOR_ID_LSB ... TPS80031_USB_OTG_REVISION:
-       case TPS80031_GPADC_CTRL ... TPS80031_CTRL_P1:
-       case TPS80031_RTCH0_LSB ... TPS80031_GPCH0_MSB:
-       case TPS80031_TOGGLE1 ... TPS80031_VIBMODE:
-       case TPS80031_PWM1ON ... TPS80031_PWM2OFF:
-       case TPS80031_FG_REG_00 ... TPS80031_FG_REG_11:
-       case TPS80031_INT_STS_A ... TPS80031_INT_MSK_STS_C:
-       case TPS80031_CONTROLLER_CTRL2 ... TPS80031_LED_PWM_CTRL2:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static bool rd_wr_reg_id3(struct device *dev, unsigned int reg)
-{
-       switch (reg) {
-       case TPS80031_GPADC_TRIM0 ... TPS80031_GPADC_TRIM18:
-               return true;
-       default:
-               return false;
-       }
-}
-
-static const struct regmap_config tps80031_regmap_configs[] = {
-       {
-               .reg_bits = 8,
-               .val_bits = 8,
-               .writeable_reg = rd_wr_reg_id0,
-               .readable_reg = rd_wr_reg_id0,
-               .max_register = TPS80031_MAX_REGISTER,
-       },
-       {
-               .reg_bits = 8,
-               .val_bits = 8,
-               .writeable_reg = rd_wr_reg_id1,
-               .readable_reg = rd_wr_reg_id1,
-               .volatile_reg = is_volatile_reg_id1,
-               .max_register = TPS80031_MAX_REGISTER,
-       },
-       {
-               .reg_bits = 8,
-               .val_bits = 8,
-               .writeable_reg = rd_wr_reg_id2,
-               .readable_reg = rd_wr_reg_id2,
-               .max_register = TPS80031_MAX_REGISTER,
-       },
-       {
-               .reg_bits = 8,
-               .val_bits = 8,
-               .writeable_reg = rd_wr_reg_id3,
-               .readable_reg = rd_wr_reg_id3,
-               .max_register = TPS80031_MAX_REGISTER,
-       },
-};
-
-static int tps80031_probe(struct i2c_client *client,
-                         const struct i2c_device_id *id)
-{
-       struct tps80031_platform_data *pdata = dev_get_platdata(&client->dev);
-       struct tps80031 *tps80031;
-       int ret;
-       uint8_t es_version;
-       uint8_t ep_ver;
-       int i;
-
-       if (!pdata) {
-               dev_err(&client->dev, "tps80031 requires platform data\n");
-               return -EINVAL;
-       }
-
-       tps80031 = devm_kzalloc(&client->dev, sizeof(*tps80031), GFP_KERNEL);
-       if (!tps80031)
-               return -ENOMEM;
-
-       for (i = 0; i < TPS80031_NUM_SLAVES; i++) {
-               if (tps80031_slave_address[i] == client->addr)
-                       tps80031->clients[i] = client;
-               else
-                       tps80031->clients[i] = devm_i2c_new_dummy_device(&client->dev,
-                                               client->adapter, tps80031_slave_address[i]);
-               if (IS_ERR(tps80031->clients[i])) {
-                       dev_err(&client->dev, "can't attach client %d\n", i);
-                       return PTR_ERR(tps80031->clients[i]);
-               }
-
-               i2c_set_clientdata(tps80031->clients[i], tps80031);
-               tps80031->regmap[i] = devm_regmap_init_i2c(tps80031->clients[i],
-                                       &tps80031_regmap_configs[i]);
-               if (IS_ERR(tps80031->regmap[i])) {
-                       ret = PTR_ERR(tps80031->regmap[i]);
-                       dev_err(&client->dev,
-                               "regmap %d init failed, err %d\n", i, ret);
-                       return ret;
-               }
-       }
-
-       ret = tps80031_read(&client->dev, TPS80031_SLAVE_ID3,
-                       TPS80031_JTAGVERNUM, &es_version);
-       if (ret < 0) {
-               dev_err(&client->dev,
-                       "Silicon version number read failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = tps80031_read(&client->dev, TPS80031_SLAVE_ID3,
-                       TPS80031_EPROM_REV, &ep_ver);
-       if (ret < 0) {
-               dev_err(&client->dev,
-                       "Silicon eeprom version read failed: %d\n", ret);
-               return ret;
-       }
-
-       dev_info(&client->dev, "ES version 0x%02x and EPROM version 0x%02x\n",
-                                       es_version, ep_ver);
-       tps80031->es_version = es_version;
-       tps80031->dev = &client->dev;
-       i2c_set_clientdata(client, tps80031);
-       tps80031->chip_info = id->driver_data;
-
-       ret = tps80031_irq_init(tps80031, client->irq, pdata->irq_base);
-       if (ret) {
-               dev_err(&client->dev, "IRQ init failed: %d\n", ret);
-               return ret;
-       }
-
-       tps80031_pupd_init(tps80031, pdata);
-
-       tps80031_init_ext_control(tps80031, pdata);
-
-       ret = mfd_add_devices(tps80031->dev, -1,
-                       tps80031_cell, ARRAY_SIZE(tps80031_cell),
-                       NULL, 0,
-                       regmap_irq_get_domain(tps80031->irq_data));
-       if (ret < 0) {
-               dev_err(&client->dev, "mfd_add_devices failed: %d\n", ret);
-               goto fail_mfd_add;
-       }
-
-       if (pdata->use_power_off && !pm_power_off) {
-               tps80031_power_off_dev = tps80031;
-               pm_power_off = tps80031_power_off;
-       }
-       return 0;
-
-fail_mfd_add:
-       regmap_del_irq_chip(client->irq, tps80031->irq_data);
-       return ret;
-}
-
-static const struct i2c_device_id tps80031_id_table[] = {
-       { "tps80031", TPS80031 },
-       { "tps80032", TPS80032 },
-       { }
-};
-
-static struct i2c_driver tps80031_driver = {
-       .driver = {
-               .name                   = "tps80031",
-               .suppress_bind_attrs    = true,
-       },
-       .probe          = tps80031_probe,
-       .id_table       = tps80031_id_table,
-};
-
-static int __init tps80031_init(void)
-{
-       return i2c_add_driver(&tps80031_driver);
-}
-subsys_initcall(tps80031_init);
diff --git a/include/linux/mfd/tps80031.h b/include/linux/mfd/tps80031.h
deleted file mode 100644 (file)
index 2c75c9c..0000000
+++ /dev/null
@@ -1,637 +0,0 @@
-/*
- * tps80031.h -- TI TPS80031 and TI TPS80032 PMIC driver.
- *
- * Copyright (c) 2012, NVIDIA Corporation.
- *
- * Author: Laxman Dewangan <ldewangan@nvidia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
- * whether express or implied; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA
- */
-
-#ifndef __LINUX_MFD_TPS80031_H
-#define __LINUX_MFD_TPS80031_H
-
-#include <linux/device.h>
-#include <linux/regmap.h>
-
-/* Pull-ups/Pull-downs */
-#define TPS80031_CFG_INPUT_PUPD1                       0xF0
-#define TPS80031_CFG_INPUT_PUPD2                       0xF1
-#define TPS80031_CFG_INPUT_PUPD3                       0xF2
-#define TPS80031_CFG_INPUT_PUPD4                       0xF3
-#define TPS80031_CFG_LDO_PD1                           0xF4
-#define TPS80031_CFG_LDO_PD2                           0xF5
-#define TPS80031_CFG_SMPS_PD                           0xF6
-
-/* Real Time Clock */
-#define TPS80031_SECONDS_REG                           0x00
-#define TPS80031_MINUTES_REG                           0x01
-#define TPS80031_HOURS_REG                             0x02
-#define TPS80031_DAYS_REG                              0x03
-#define TPS80031_MONTHS_REG                            0x04
-#define TPS80031_YEARS_REG                             0x05
-#define TPS80031_WEEKS_REG                             0x06
-#define TPS80031_ALARM_SECONDS_REG                     0x08
-#define TPS80031_ALARM_MINUTES_REG                     0x09
-#define TPS80031_ALARM_HOURS_REG                       0x0A
-#define TPS80031_ALARM_DAYS_REG                                0x0B
-#define TPS80031_ALARM_MONTHS_REG                      0x0C
-#define TPS80031_ALARM_YEARS_REG                       0x0D
-#define TPS80031_RTC_CTRL_REG                          0x10
-#define TPS80031_RTC_STATUS_REG                                0x11
-#define TPS80031_RTC_INTERRUPTS_REG                    0x12
-#define TPS80031_RTC_COMP_LSB_REG                      0x13
-#define TPS80031_RTC_COMP_MSB_REG                      0x14
-#define TPS80031_RTC_RESET_STATUS_REG                  0x16
-
-/*PMC Master Module */
-#define TPS80031_PHOENIX_START_CONDITION               0x1F
-#define TPS80031_PHOENIX_MSK_TRANSITION                        0x20
-#define TPS80031_STS_HW_CONDITIONS                     0x21
-#define TPS80031_PHOENIX_LAST_TURNOFF_STS              0x22
-#define TPS80031_VSYSMIN_LO_THRESHOLD                  0x23
-#define TPS80031_VSYSMIN_HI_THRESHOLD                  0x24
-#define TPS80031_PHOENIX_DEV_ON                                0x25
-#define TPS80031_STS_PWR_GRP_STATE                     0x27
-#define TPS80031_PH_CFG_VSYSLOW                                0x28
-#define TPS80031_PH_STS_BOOT                           0x29
-#define TPS80031_PHOENIX_SENS_TRANSITION               0x2A
-#define TPS80031_PHOENIX_SEQ_CFG                       0x2B
-#define TPS80031_PRIMARY_WATCHDOG_CFG                  0X2C
-#define TPS80031_KEY_PRESS_DUR_CFG                     0X2D
-#define TPS80031_SMPS_LDO_SHORT_STS                    0x2E
-
-/* PMC Slave Module - Broadcast */
-#define TPS80031_BROADCAST_ADDR_ALL                    0x31
-#define TPS80031_BROADCAST_ADDR_REF                    0x32
-#define TPS80031_BROADCAST_ADDR_PROV                   0x33
-#define TPS80031_BROADCAST_ADDR_CLK_RST                        0x34
-
-/* PMC Slave Module  SMPS Regulators */
-#define TPS80031_SMPS4_CFG_TRANS                       0x41
-#define TPS80031_SMPS4_CFG_STATE                       0x42
-#define TPS80031_SMPS4_CFG_VOLTAGE                     0x44
-#define TPS80031_VIO_CFG_TRANS                         0x47
-#define TPS80031_VIO_CFG_STATE                         0x48
-#define TPS80031_VIO_CFG_FORCE                         0x49
-#define TPS80031_VIO_CFG_VOLTAGE                       0x4A
-#define TPS80031_VIO_CFG_STEP                          0x48
-#define TPS80031_SMPS1_CFG_TRANS                       0x53
-#define TPS80031_SMPS1_CFG_STATE                       0x54
-#define TPS80031_SMPS1_CFG_FORCE                       0x55
-#define TPS80031_SMPS1_CFG_VOLTAGE                     0x56
-#define TPS80031_SMPS1_CFG_STEP                                0x57
-#define TPS80031_SMPS2_CFG_TRANS                       0x59
-#define TPS80031_SMPS2_CFG_STATE                       0x5A
-#define TPS80031_SMPS2_CFG_FORCE                       0x5B
-#define TPS80031_SMPS2_CFG_VOLTAGE                     0x5C
-#define TPS80031_SMPS2_CFG_STEP                                0x5D
-#define TPS80031_SMPS3_CFG_TRANS                       0x65
-#define TPS80031_SMPS3_CFG_STATE                       0x66
-#define TPS80031_SMPS3_CFG_VOLTAGE                     0x68
-
-/* PMC Slave Module  LDO Regulators */
-#define TPS80031_VANA_CFG_TRANS                                0x81
-#define TPS80031_VANA_CFG_STATE                                0x82
-#define TPS80031_VANA_CFG_VOLTAGE                      0x83
-#define TPS80031_LDO2_CFG_TRANS                                0x85
-#define TPS80031_LDO2_CFG_STATE                                0x86
-#define TPS80031_LDO2_CFG_VOLTAGE                      0x87
-#define TPS80031_LDO4_CFG_TRANS                                0x89
-#define TPS80031_LDO4_CFG_STATE                                0x8A
-#define TPS80031_LDO4_CFG_VOLTAGE                      0x8B
-#define TPS80031_LDO3_CFG_TRANS                                0x8D
-#define TPS80031_LDO3_CFG_STATE                                0x8E
-#define TPS80031_LDO3_CFG_VOLTAGE                      0x8F
-#define TPS80031_LDO6_CFG_TRANS                                0x91
-#define TPS80031_LDO6_CFG_STATE                                0x92
-#define TPS80031_LDO6_CFG_VOLTAGE                      0x93
-#define TPS80031_LDOLN_CFG_TRANS                       0x95
-#define TPS80031_LDOLN_CFG_STATE                       0x96
-#define TPS80031_LDOLN_CFG_VOLTAGE                     0x97
-#define TPS80031_LDO5_CFG_TRANS                                0x99
-#define TPS80031_LDO5_CFG_STATE                                0x9A
-#define TPS80031_LDO5_CFG_VOLTAGE                      0x9B
-#define TPS80031_LDO1_CFG_TRANS                                0x9D
-#define TPS80031_LDO1_CFG_STATE                                0x9E
-#define TPS80031_LDO1_CFG_VOLTAGE                      0x9F
-#define TPS80031_LDOUSB_CFG_TRANS                      0xA1
-#define TPS80031_LDOUSB_CFG_STATE                      0xA2
-#define TPS80031_LDOUSB_CFG_VOLTAGE                    0xA3
-#define TPS80031_LDO7_CFG_TRANS                                0xA5
-#define TPS80031_LDO7_CFG_STATE                                0xA6
-#define TPS80031_LDO7_CFG_VOLTAGE                      0xA7
-
-/* PMC Slave Module  External Control */
-#define TPS80031_REGEN1_CFG_TRANS                      0xAE
-#define TPS80031_REGEN1_CFG_STATE                      0xAF
-#define TPS80031_REGEN2_CFG_TRANS                      0xB1
-#define TPS80031_REGEN2_CFG_STATE                      0xB2
-#define TPS80031_SYSEN_CFG_TRANS                       0xB4
-#define TPS80031_SYSEN_CFG_STATE                       0xB5
-
-/* PMC Slave Module  Internal Control */
-#define TPS80031_NRESPWRON_CFG_TRANS                   0xB7
-#define TPS80031_NRESPWRON_CFG_STATE                   0xB8
-#define TPS80031_CLK32KAO_CFG_TRANS                    0xBA
-#define TPS80031_CLK32KAO_CFG_STATE                    0xBB
-#define TPS80031_CLK32KG_CFG_TRANS                     0xBD
-#define TPS80031_CLK32KG_CFG_STATE                     0xBE
-#define TPS80031_CLK32KAUDIO_CFG_TRANS                 0xC0
-#define TPS80031_CLK32KAUDIO_CFG_STATE                 0xC1
-#define TPS80031_VRTC_CFG_TRANS                                0xC3
-#define TPS80031_VRTC_CFG_STATE                                0xC4
-#define TPS80031_BIAS_CFG_TRANS                                0xC6
-#define TPS80031_BIAS_CFG_STATE                                0xC7
-#define TPS80031_VSYSMIN_HI_CFG_TRANS                  0xC9
-#define TPS80031_VSYSMIN_HI_CFG_STATE                  0xCA
-#define TPS80031_RC6MHZ_CFG_TRANS                      0xCC
-#define TPS80031_RC6MHZ_CFG_STATE                      0xCD
-#define TPS80031_TMP_CFG_TRANS                         0xCF
-#define TPS80031_TMP_CFG_STATE                         0xD0
-
-/* PMC Slave Module  resources assignment */
-#define TPS80031_PREQ1_RES_ASS_A                       0xD7
-#define TPS80031_PREQ1_RES_ASS_B                       0xD8
-#define TPS80031_PREQ1_RES_ASS_C                       0xD9
-#define TPS80031_PREQ2_RES_ASS_A                       0xDA
-#define TPS80031_PREQ2_RES_ASS_B                       0xDB
-#define TPS80031_PREQ2_RES_ASS_C                       0xDC
-#define TPS80031_PREQ3_RES_ASS_A                       0xDD
-#define TPS80031_PREQ3_RES_ASS_B                       0xDE
-#define TPS80031_PREQ3_RES_ASS_C                       0xDF
-
-/* PMC Slave Module  Miscellaneous */
-#define TPS80031_SMPS_OFFSET                           0xE0
-#define TPS80031_SMPS_MULT                             0xE3
-#define TPS80031_MISC1                                 0xE4
-#define TPS80031_MISC2                                 0xE5
-#define TPS80031_BBSPOR_CFG                            0xE6
-#define TPS80031_TMP_CFG                               0xE7
-
-/* Battery Charging Controller and Indicator LED */
-#define TPS80031_CONTROLLER_CTRL2                      0xDA
-#define TPS80031_CONTROLLER_VSEL_COMP                  0xDB
-#define TPS80031_CHARGERUSB_VSYSREG                    0xDC
-#define TPS80031_CHARGERUSB_VICHRG_PC                  0xDD
-#define TPS80031_LINEAR_CHRG_STS                       0xDE
-#define TPS80031_CONTROLLER_INT_MASK                   0xE0
-#define TPS80031_CONTROLLER_CTRL1                      0xE1
-#define TPS80031_CONTROLLER_WDG                                0xE2
-#define TPS80031_CONTROLLER_STAT1                      0xE3
-#define TPS80031_CHARGERUSB_INT_STATUS                 0xE4
-#define TPS80031_CHARGERUSB_INT_MASK                   0xE5
-#define TPS80031_CHARGERUSB_STATUS_INT1                        0xE6
-#define TPS80031_CHARGERUSB_STATUS_INT2                        0xE7
-#define TPS80031_CHARGERUSB_CTRL1                      0xE8
-#define TPS80031_CHARGERUSB_CTRL2                      0xE9
-#define TPS80031_CHARGERUSB_CTRL3                      0xEA
-#define TPS80031_CHARGERUSB_STAT1                      0xEB
-#define TPS80031_CHARGERUSB_VOREG                      0xEC
-#define TPS80031_CHARGERUSB_VICHRG                     0xED
-#define TPS80031_CHARGERUSB_CINLIMIT                   0xEE
-#define TPS80031_CHARGERUSB_CTRLLIMIT1                 0xEF
-#define TPS80031_CHARGERUSB_CTRLLIMIT2                 0xF0
-#define TPS80031_LED_PWM_CTRL1                         0xF4
-#define TPS80031_LED_PWM_CTRL2                         0xF5
-
-/* USB On-The-Go  */
-#define TPS80031_BACKUP_REG                            0xFA
-#define TPS80031_USB_VENDOR_ID_LSB                     0x00
-#define TPS80031_USB_VENDOR_ID_MSB                     0x01
-#define TPS80031_USB_PRODUCT_ID_LSB                    0x02
-#define TPS80031_USB_PRODUCT_ID_MSB                    0x03
-#define TPS80031_USB_VBUS_CTRL_SET                     0x04
-#define TPS80031_USB_VBUS_CTRL_CLR                     0x05
-#define TPS80031_USB_ID_CTRL_SET                       0x06
-#define TPS80031_USB_ID_CTRL_CLR                       0x07
-#define TPS80031_USB_VBUS_INT_SRC                      0x08
-#define TPS80031_USB_VBUS_INT_LATCH_SET                        0x09
-#define TPS80031_USB_VBUS_INT_LATCH_CLR                        0x0A
-#define TPS80031_USB_VBUS_INT_EN_LO_SET                        0x0B
-#define TPS80031_USB_VBUS_INT_EN_LO_CLR                        0x0C
-#define TPS80031_USB_VBUS_INT_EN_HI_SET                        0x0D
-#define TPS80031_USB_VBUS_INT_EN_HI_CLR                        0x0E
-#define TPS80031_USB_ID_INT_SRC                                0x0F
-#define TPS80031_USB_ID_INT_LATCH_SET                  0x10
-#define TPS80031_USB_ID_INT_LATCH_CLR                  0x11
-#define TPS80031_USB_ID_INT_EN_LO_SET                  0x12
-#define TPS80031_USB_ID_INT_EN_LO_CLR                  0x13
-#define TPS80031_USB_ID_INT_EN_HI_SET                  0x14
-#define TPS80031_USB_ID_INT_EN_HI_CLR                  0x15
-#define TPS80031_USB_OTG_ADP_CTRL                      0x16
-#define TPS80031_USB_OTG_ADP_HIGH                      0x17
-#define TPS80031_USB_OTG_ADP_LOW                       0x18
-#define TPS80031_USB_OTG_ADP_RISE                      0x19
-#define TPS80031_USB_OTG_REVISION                      0x1A
-
-/* Gas Gauge */
-#define TPS80031_FG_REG_00                             0xC0
-#define TPS80031_FG_REG_01                             0xC1
-#define TPS80031_FG_REG_02                             0xC2
-#define TPS80031_FG_REG_03                             0xC3
-#define TPS80031_FG_REG_04                             0xC4
-#define TPS80031_FG_REG_05                             0xC5
-#define TPS80031_FG_REG_06                             0xC6
-#define TPS80031_FG_REG_07                             0xC7
-#define TPS80031_FG_REG_08                             0xC8
-#define TPS80031_FG_REG_09                             0xC9
-#define TPS80031_FG_REG_10                             0xCA
-#define TPS80031_FG_REG_11                             0xCB
-
-/* General Purpose ADC */
-#define TPS80031_GPADC_CTRL                            0x2E
-#define TPS80031_GPADC_CTRL2                           0x2F
-#define TPS80031_RTSELECT_LSB                          0x32
-#define TPS80031_RTSELECT_ISB                          0x33
-#define TPS80031_RTSELECT_MSB                          0x34
-#define TPS80031_GPSELECT_ISB                          0x35
-#define TPS80031_CTRL_P1                               0x36
-#define TPS80031_RTCH0_LSB                             0x37
-#define TPS80031_RTCH0_MSB                             0x38
-#define TPS80031_RTCH1_LSB                             0x39
-#define TPS80031_RTCH1_MSB                             0x3A
-#define TPS80031_GPCH0_LSB                             0x3B
-#define TPS80031_GPCH0_MSB                             0x3C
-
-/* SIM, MMC and Battery Detection */
-#define TPS80031_SIMDEBOUNCING                         0xEB
-#define TPS80031_SIMCTRL                               0xEC
-#define TPS80031_MMCDEBOUNCING                         0xED
-#define TPS80031_MMCCTRL                               0xEE
-#define TPS80031_BATDEBOUNCING                         0xEF
-
-/* Vibrator Driver and PWMs */
-#define TPS80031_VIBCTRL                               0x9B
-#define TPS80031_VIBMODE                               0x9C
-#define TPS80031_PWM1ON                                        0xBA
-#define TPS80031_PWM1OFF                               0xBB
-#define TPS80031_PWM2ON                                        0xBD
-#define TPS80031_PWM2OFF                               0xBE
-
-/* Control Interface */
-#define TPS80031_INT_STS_A                             0xD0
-#define TPS80031_INT_STS_B                             0xD1
-#define TPS80031_INT_STS_C                             0xD2
-#define TPS80031_INT_MSK_LINE_A                                0xD3
-#define TPS80031_INT_MSK_LINE_B                                0xD4
-#define TPS80031_INT_MSK_LINE_C                                0xD5
-#define TPS80031_INT_MSK_STS_A                         0xD6
-#define TPS80031_INT_MSK_STS_B                         0xD7
-#define TPS80031_INT_MSK_STS_C                         0xD8
-#define TPS80031_TOGGLE1                               0x90
-#define TPS80031_TOGGLE2                               0x91
-#define TPS80031_TOGGLE3                               0x92
-#define TPS80031_PWDNSTATUS1                           0x93
-#define TPS80031_PWDNSTATUS2                           0x94
-#define TPS80031_VALIDITY0                             0x17
-#define TPS80031_VALIDITY1                             0x18
-#define TPS80031_VALIDITY2                             0x19
-#define TPS80031_VALIDITY3                             0x1A
-#define TPS80031_VALIDITY4                             0x1B
-#define TPS80031_VALIDITY5                             0x1C
-#define TPS80031_VALIDITY6                             0x1D
-#define TPS80031_VALIDITY7                             0x1E
-
-/* Version number related register */
-#define TPS80031_JTAGVERNUM                            0x87
-#define TPS80031_EPROM_REV                             0xDF
-
-/* GPADC Trimming Bits. */
-#define TPS80031_GPADC_TRIM0                           0xCC
-#define TPS80031_GPADC_TRIM1                           0xCD
-#define TPS80031_GPADC_TRIM2                           0xCE
-#define TPS80031_GPADC_TRIM3                           0xCF
-#define TPS80031_GPADC_TRIM4                           0xD0
-#define TPS80031_GPADC_TRIM5                           0xD1
-#define TPS80031_GPADC_TRIM6                           0xD2
-#define TPS80031_GPADC_TRIM7                           0xD3
-#define TPS80031_GPADC_TRIM8                           0xD4
-#define TPS80031_GPADC_TRIM9                           0xD5
-#define TPS80031_GPADC_TRIM10                          0xD6
-#define TPS80031_GPADC_TRIM11                          0xD7
-#define TPS80031_GPADC_TRIM12                          0xD8
-#define TPS80031_GPADC_TRIM13                          0xD9
-#define TPS80031_GPADC_TRIM14                          0xDA
-#define TPS80031_GPADC_TRIM15                          0xDB
-#define TPS80031_GPADC_TRIM16                          0xDC
-#define TPS80031_GPADC_TRIM17                          0xDD
-#define TPS80031_GPADC_TRIM18                          0xDE
-
-/* TPS80031_CONTROLLER_STAT1 bit fields */
-#define TPS80031_CONTROLLER_STAT1_BAT_TEMP             0
-#define TPS80031_CONTROLLER_STAT1_BAT_REMOVED          1
-#define TPS80031_CONTROLLER_STAT1_VBUS_DET             2
-#define TPS80031_CONTROLLER_STAT1_VAC_DET              3
-#define TPS80031_CONTROLLER_STAT1_FAULT_WDG            4
-#define TPS80031_CONTROLLER_STAT1_LINCH_GATED          6
-/* TPS80031_CONTROLLER_INT_MASK bit filed */
-#define TPS80031_CONTROLLER_INT_MASK_MVAC_DET          0
-#define TPS80031_CONTROLLER_INT_MASK_MVBUS_DET         1
-#define TPS80031_CONTROLLER_INT_MASK_MBAT_TEMP         2
-#define TPS80031_CONTROLLER_INT_MASK_MFAULT_WDG                3
-#define TPS80031_CONTROLLER_INT_MASK_MBAT_REMOVED      4
-#define TPS80031_CONTROLLER_INT_MASK_MLINCH_GATED      5
-
-#define TPS80031_CHARGE_CONTROL_SUB_INT_MASK           0x3F
-
-/* TPS80031_PHOENIX_DEV_ON bit field */
-#define TPS80031_DEVOFF                                        0x1
-
-#define TPS80031_EXT_CONTROL_CFG_TRANS                 0
-#define TPS80031_EXT_CONTROL_CFG_STATE                 1
-
-/* State register field */
-#define TPS80031_STATE_OFF                             0x00
-#define TPS80031_STATE_ON                              0x01
-#define TPS80031_STATE_MASK                            0x03
-
-/* Trans register field */
-#define TPS80031_TRANS_ACTIVE_OFF                      0x00
-#define TPS80031_TRANS_ACTIVE_ON                       0x01
-#define TPS80031_TRANS_ACTIVE_MASK                     0x03
-#define TPS80031_TRANS_SLEEP_OFF                       0x00
-#define TPS80031_TRANS_SLEEP_ON                                0x04
-#define TPS80031_TRANS_SLEEP_MASK                      0x0C
-#define TPS80031_TRANS_OFF_OFF                         0x00
-#define TPS80031_TRANS_OFF_ACTIVE                      0x10
-#define TPS80031_TRANS_OFF_MASK                                0x30
-
-#define TPS80031_EXT_PWR_REQ           (TPS80031_PWR_REQ_INPUT_PREQ1 | \
-                                       TPS80031_PWR_REQ_INPUT_PREQ2 | \
-                                       TPS80031_PWR_REQ_INPUT_PREQ3)
-
-/* TPS80031_BBSPOR_CFG bit field */
-#define TPS80031_BBSPOR_CHG_EN                         0x8
-#define TPS80031_MAX_REGISTER                          0xFF
-
-struct i2c_client;
-
-/* Supported chips */
-enum chips {
-       TPS80031 = 0x00000001,
-       TPS80032 = 0x00000002,
-};
-
-enum {
-       TPS80031_INT_PWRON,
-       TPS80031_INT_RPWRON,
-       TPS80031_INT_SYS_VLOW,
-       TPS80031_INT_RTC_ALARM,
-       TPS80031_INT_RTC_PERIOD,
-       TPS80031_INT_HOT_DIE,
-       TPS80031_INT_VXX_SHORT,
-       TPS80031_INT_SPDURATION,
-       TPS80031_INT_WATCHDOG,
-       TPS80031_INT_BAT,
-       TPS80031_INT_SIM,
-       TPS80031_INT_MMC,
-       TPS80031_INT_RES,
-       TPS80031_INT_GPADC_RT,
-       TPS80031_INT_GPADC_SW2_EOC,
-       TPS80031_INT_CC_AUTOCAL,
-       TPS80031_INT_ID_WKUP,
-       TPS80031_INT_VBUSS_WKUP,
-       TPS80031_INT_ID,
-       TPS80031_INT_VBUS,
-       TPS80031_INT_CHRG_CTRL,
-       TPS80031_INT_EXT_CHRG,
-       TPS80031_INT_INT_CHRG,
-       TPS80031_INT_RES2,
-       TPS80031_INT_BAT_TEMP_OVRANGE,
-       TPS80031_INT_BAT_REMOVED,
-       TPS80031_INT_VBUS_DET,
-       TPS80031_INT_VAC_DET,
-       TPS80031_INT_FAULT_WDG,
-       TPS80031_INT_LINCH_GATED,
-
-       /* Last interrupt id to get the end number */
-       TPS80031_INT_NR,
-};
-
-/* TPS80031 Slave IDs */
-#define TPS80031_NUM_SLAVES                            4
-#define TPS80031_SLAVE_ID0                             0
-#define TPS80031_SLAVE_ID1                             1
-#define TPS80031_SLAVE_ID2                             2
-#define TPS80031_SLAVE_ID3                             3
-
-/* TPS80031 I2C addresses */
-#define TPS80031_I2C_ID0_ADDR                          0x12
-#define TPS80031_I2C_ID1_ADDR                          0x48
-#define TPS80031_I2C_ID2_ADDR                          0x49
-#define TPS80031_I2C_ID3_ADDR                          0x4A
-
-enum {
-       TPS80031_REGULATOR_VIO,
-       TPS80031_REGULATOR_SMPS1,
-       TPS80031_REGULATOR_SMPS2,
-       TPS80031_REGULATOR_SMPS3,
-       TPS80031_REGULATOR_SMPS4,
-       TPS80031_REGULATOR_VANA,
-       TPS80031_REGULATOR_LDO1,
-       TPS80031_REGULATOR_LDO2,
-       TPS80031_REGULATOR_LDO3,
-       TPS80031_REGULATOR_LDO4,
-       TPS80031_REGULATOR_LDO5,
-       TPS80031_REGULATOR_LDO6,
-       TPS80031_REGULATOR_LDO7,
-       TPS80031_REGULATOR_LDOLN,
-       TPS80031_REGULATOR_LDOUSB,
-       TPS80031_REGULATOR_VBUS,
-       TPS80031_REGULATOR_REGEN1,
-       TPS80031_REGULATOR_REGEN2,
-       TPS80031_REGULATOR_SYSEN,
-       TPS80031_REGULATOR_MAX,
-};
-
-/* Different configurations for the rails */
-enum {
-       /* USBLDO input selection */
-       TPS80031_USBLDO_INPUT_VSYS              = 0x00000001,
-       TPS80031_USBLDO_INPUT_PMID              = 0x00000002,
-
-       /* LDO3 output mode */
-       TPS80031_LDO3_OUTPUT_VIB                = 0x00000004,
-
-       /* VBUS configuration */
-       TPS80031_VBUS_DISCHRG_EN_PDN            = 0x00000004,
-       TPS80031_VBUS_SW_ONLY                   = 0x00000008,
-       TPS80031_VBUS_SW_N_ID                   = 0x00000010,
-};
-
-/* External controls requests */
-enum tps80031_ext_control {
-       TPS80031_PWR_REQ_INPUT_NONE             = 0x00000000,
-       TPS80031_PWR_REQ_INPUT_PREQ1            = 0x00000001,
-       TPS80031_PWR_REQ_INPUT_PREQ2            = 0x00000002,
-       TPS80031_PWR_REQ_INPUT_PREQ3            = 0x00000004,
-       TPS80031_PWR_OFF_ON_SLEEP               = 0x00000008,
-       TPS80031_PWR_ON_ON_SLEEP                = 0x00000010,
-};
-
-enum tps80031_pupd_pins {
-       TPS80031_PREQ1 = 0,
-       TPS80031_PREQ2A,
-       TPS80031_PREQ2B,
-       TPS80031_PREQ2C,
-       TPS80031_PREQ3,
-       TPS80031_NRES_WARM,
-       TPS80031_PWM_FORCE,
-       TPS80031_CHRG_EXT_CHRG_STATZ,
-       TPS80031_SIM,
-       TPS80031_MMC,
-       TPS80031_GPADC_START,
-       TPS80031_DVSI2C_SCL,
-       TPS80031_DVSI2C_SDA,
-       TPS80031_CTLI2C_SCL,
-       TPS80031_CTLI2C_SDA,
-};
-
-enum tps80031_pupd_settings {
-       TPS80031_PUPD_NORMAL,
-       TPS80031_PUPD_PULLDOWN,
-       TPS80031_PUPD_PULLUP,
-};
-
-struct tps80031 {
-       struct device           *dev;
-       unsigned long           chip_info;
-       int                     es_version;
-       struct i2c_client       *clients[TPS80031_NUM_SLAVES];
-       struct regmap           *regmap[TPS80031_NUM_SLAVES];
-       struct regmap_irq_chip_data *irq_data;
-};
-
-struct tps80031_pupd_init_data {
-       int input_pin;
-       int setting;
-};
-
-/*
- * struct tps80031_regulator_platform_data - tps80031 regulator platform data.
- *
- * @reg_init_data: The regulator init data.
- * @ext_ctrl_flag: External control flag for sleep/power request control.
- * @config_flags: Configuration flag to configure the rails.
- *               It should be ORed of config enums.
- */
-
-struct tps80031_regulator_platform_data {
-       struct regulator_init_data *reg_init_data;
-       unsigned int ext_ctrl_flag;
-       unsigned int config_flags;
-};
-
-struct tps80031_platform_data {
-       int irq_base;
-       bool use_power_off;
-       struct tps80031_pupd_init_data *pupd_init_data;
-       int pupd_init_data_size;
-       struct tps80031_regulator_platform_data
-                       *regulator_pdata[TPS80031_REGULATOR_MAX];
-};
-
-static inline int tps80031_write(struct device *dev, int sid,
-               int reg, uint8_t val)
-{
-       struct tps80031 *tps80031 = dev_get_drvdata(dev);
-
-       return regmap_write(tps80031->regmap[sid], reg, val);
-}
-
-static inline int tps80031_writes(struct device *dev, int sid, int reg,
-               int len, uint8_t *val)
-{
-       struct tps80031 *tps80031 = dev_get_drvdata(dev);
-
-       return regmap_bulk_write(tps80031->regmap[sid], reg, val, len);
-}
-
-static inline int tps80031_read(struct device *dev, int sid,
-               int reg, uint8_t *val)
-{
-       struct tps80031 *tps80031 = dev_get_drvdata(dev);
-       unsigned int ival;
-       int ret;
-
-       ret = regmap_read(tps80031->regmap[sid], reg, &ival);
-       if (ret < 0) {
-               dev_err(dev, "failed reading from reg 0x%02x\n", reg);
-               return ret;
-       }
-
-       *val = ival;
-       return ret;
-}
-
-static inline int tps80031_reads(struct device *dev, int sid,
-               int reg, int len, uint8_t *val)
-{
-       struct tps80031 *tps80031 = dev_get_drvdata(dev);
-
-       return regmap_bulk_read(tps80031->regmap[sid], reg, val, len);
-}
-
-static inline int tps80031_set_bits(struct device *dev, int sid,
-               int reg, uint8_t bit_mask)
-{
-       struct tps80031 *tps80031 = dev_get_drvdata(dev);
-
-       return regmap_update_bits(tps80031->regmap[sid], reg,
-                               bit_mask, bit_mask);
-}
-
-static inline int tps80031_clr_bits(struct device *dev, int sid,
-               int reg, uint8_t bit_mask)
-{
-       struct tps80031 *tps80031 = dev_get_drvdata(dev);
-
-       return regmap_update_bits(tps80031->regmap[sid], reg, bit_mask, 0);
-}
-
-static inline int tps80031_update(struct device *dev, int sid,
-               int reg, uint8_t val, uint8_t mask)
-{
-       struct tps80031 *tps80031 = dev_get_drvdata(dev);
-
-       return regmap_update_bits(tps80031->regmap[sid], reg, mask, val);
-}
-
-static inline unsigned long tps80031_get_chip_info(struct device *dev)
-{
-       struct tps80031 *tps80031 = dev_get_drvdata(dev);
-
-       return tps80031->chip_info;
-}
-
-static inline int tps80031_get_pmu_version(struct device *dev)
-{
-       struct tps80031 *tps80031 = dev_get_drvdata(dev);
-
-       return tps80031->es_version;
-}
-
-static inline int tps80031_irq_get_virq(struct device *dev, int irq)
-{
-       struct tps80031 *tps80031 = dev_get_drvdata(dev);
-
-       return regmap_irq_get_virq(tps80031->irq_data, irq);
-}
-
-extern int tps80031_ext_power_req_config(struct device *dev,
-               unsigned long ext_ctrl_flag, int preq_bit,
-               int state_reg_add, int trans_reg_add);
-#endif /*__LINUX_MFD_TPS80031_H */