regulator: regulator driver for Palmas series chips
[linux-2.6.git] / drivers / regulator / tps62360-regulator.c
index 47246b8..dca2c88 100644 (file)
 #define REG_RAMPCTRL           6
 #define REG_CHIPID             8
 
+#define FORCE_PWM_ENABLE       BIT(7)
+
 enum chips {TPS62360, TPS62361, TPS62362, TPS62363};
 
-#define TPS62360_BASE_VOLTAGE  770
+#define TPS62360_BASE_VOLTAGE  770000
 #define TPS62360_N_VOLTAGES    64
 
-#define TPS62361_BASE_VOLTAGE  500
+#define TPS62361_BASE_VOLTAGE  500000
 #define TPS62361_N_VOLTAGES    128
 
 /* tps 62360 chip information */
@@ -66,12 +68,12 @@ struct tps62360_chip {
        int voltage_base;
        u8 voltage_reg_mask;
        bool en_internal_pulldn;
-       bool en_force_pwm;
        bool en_discharge;
        bool valid_gpios;
        int lru_index[4];
        int curr_vset_vsel[4];
        int curr_vset_id;
+       int change_uv_per_us;
 };
 
 /*
@@ -97,6 +99,7 @@ static bool find_voltage_set_register(struct tps62360_chip *tps,
        bool found = false;
        int new_vset_reg = tps->lru_index[3];
        int found_index = 3;
+
        for (i = 0; i < 4; ++i) {
                if (tps->curr_vset_vsel[tps->lru_index[i]] == req_vsel) {
                        new_vset_reg = tps->lru_index[i];
@@ -115,7 +118,7 @@ update_lru_index:
        return found;
 }
 
-static int tps62360_dcdc_get_voltage(struct regulator_dev *dev)
+static int tps62360_dcdc_get_voltage_sel(struct regulator_dev *dev)
 {
        struct tps62360_chip *tps = rdev_get_drvdata(dev);
        int vsel;
@@ -124,12 +127,12 @@ static int tps62360_dcdc_get_voltage(struct regulator_dev *dev)
 
        ret = regmap_read(tps->regmap, REG_VSET0 + tps->curr_vset_id, &data);
        if (ret < 0) {
-               dev_err(tps->dev, "%s: Error in reading register %d\n",
-                       __func__, REG_VSET0 + tps->curr_vset_id);
+               dev_err(tps->dev, "%s(): register %d read failed with err %d\n",
+                       __func__, REG_VSET0 + tps->curr_vset_id, ret);
                return ret;
        }
        vsel = (int)data & tps->voltage_reg_mask;
-       return (tps->voltage_base + vsel * 10) * 1000;
+       return vsel;
 }
 
 static int tps62360_dcdc_set_voltage(struct regulator_dev *dev,
@@ -141,17 +144,13 @@ static int tps62360_dcdc_set_voltage(struct regulator_dev *dev,
        bool found = false;
        int new_vset_id = tps->curr_vset_id;
 
-       if (max_uV < min_uV)
-               return -EINVAL;
-
-       if (min_uV >
-               ((tps->voltage_base + (tps->desc.n_voltages - 1) * 10) * 1000))
+       if ((max_uV < min_uV) || (max_uV < tps->voltage_base))
                return -EINVAL;
 
-       if (max_uV < tps->voltage_base * 1000)
+       if (min_uV > (tps->voltage_base + (tps->desc.n_voltages - 1) * 10000))
                return -EINVAL;
 
-       vsel = DIV_ROUND_UP(min_uV - (tps->voltage_base * 1000), 10000);
+       vsel = DIV_ROUND_UP(min_uV - tps->voltage_base, 10000);
        if (selector)
                *selector = (vsel & tps->voltage_reg_mask);
 
@@ -166,8 +165,9 @@ static int tps62360_dcdc_set_voltage(struct regulator_dev *dev,
                ret = regmap_update_bits(tps->regmap, REG_VSET0 + new_vset_id,
                                tps->voltage_reg_mask, vsel);
                if (ret < 0) {
-                       dev_err(tps->dev, "%s: Error in updating register %d\n",
-                                __func__, REG_VSET0 + new_vset_id);
+                       dev_err(tps->dev,
+                               "%s(): register %d update failed with err %d\n",
+                                __func__, REG_VSET0 + new_vset_id, ret);
                        return ret;
                }
                tps->curr_vset_id = new_vset_id;
@@ -176,8 +176,7 @@ static int tps62360_dcdc_set_voltage(struct regulator_dev *dev,
 
        /* Select proper VSET register vio gpios */
        if (tps->valid_gpios) {
-               gpio_set_value_cansleep(tps->vsel0_gpio,
-                                       new_vset_id & 0x1);
+               gpio_set_value_cansleep(tps->vsel0_gpio, new_vset_id & 0x1);
                gpio_set_value_cansleep(tps->vsel1_gpio,
                                        (new_vset_id >> 1) & 0x1);
        }
@@ -191,74 +190,136 @@ static int tps62360_dcdc_list_voltage(struct regulator_dev *dev,
 
        if (selector >= tps->desc.n_voltages)
                return -EINVAL;
-       return (tps->voltage_base + selector * 10) * 1000;
+
+       return tps->voltage_base + selector * 10000;
 }
 
-static struct regulator_ops tps62360_dcdc_ops = {
-       .get_voltage = tps62360_dcdc_get_voltage,
-       .set_voltage = tps62360_dcdc_set_voltage,
-       .list_voltage = tps62360_dcdc_list_voltage,
-};
+static int tps62360_set_voltage_time_sel(struct regulator_dev *rdev,
+               unsigned int old_selector, unsigned int new_selector)
+{
+       struct tps62360_chip *tps = rdev_get_drvdata(rdev);
+       int old_uV, new_uV;
+
+       old_uV = tps62360_dcdc_list_voltage(rdev, old_selector);
+       if (old_uV < 0)
+               return old_uV;
+
+       new_uV = tps62360_dcdc_list_voltage(rdev, new_selector);
+       if (new_uV < 0)
+               return new_uV;
+
+       return DIV_ROUND_UP(abs(old_uV - new_uV), tps->change_uv_per_us);
+}
+
+static int tps62360_set_mode(struct regulator_dev *rdev, unsigned int mode)
+{
+       struct tps62360_chip *tps = rdev_get_drvdata(rdev);
+       int i;
+       int val;
+       int ret;
+
+       /* Enable force PWM mode in FAST mode only. */
+       switch (mode) {
+       case REGULATOR_MODE_FAST:
+               val = FORCE_PWM_ENABLE;
+               break;
+
+       case REGULATOR_MODE_NORMAL:
+               val = 0;
+               break;
+
+       default:
+               return -EINVAL;
+       }
+
+       if (!tps->valid_gpios) {
+               ret = regmap_update_bits(tps->regmap,
+                       REG_VSET0 + tps->curr_vset_id, FORCE_PWM_ENABLE, val);
+               if (ret < 0)
+                       dev_err(tps->dev,
+                               "%s(): register %d update failed with err %d\n",
+                               __func__, REG_VSET0 + tps->curr_vset_id, ret);
+               return ret;
+       }
+
+       /* If gpios are valid then all register set need to be control */
+       for (i = 0; i < 4; ++i) {
+               ret = regmap_update_bits(tps->regmap,
+                                       REG_VSET0 + i, FORCE_PWM_ENABLE, val);
+               if (ret < 0) {
+                       dev_err(tps->dev,
+                               "%s(): register %d update failed with err %d\n",
+                               __func__, REG_VSET0 + i, ret);
+                       return ret;
+               }
+       }
+       return ret;
+}
 
-static int tps62360_init_force_pwm(struct tps62360_chip *tps,
-       struct tps62360_regulator_platform_data *pdata,
-       int vset_id)
+static unsigned int tps62360_get_mode(struct regulator_dev *rdev)
 {
+       struct tps62360_chip *tps = rdev_get_drvdata(rdev);
        unsigned int data;
        int ret;
-       ret = regmap_read(tps->regmap, REG_VSET0 + vset_id, &data);
+
+       ret = regmap_read(tps->regmap, REG_VSET0 + tps->curr_vset_id, &data);
        if (ret < 0) {
-               dev_err(tps->dev, "%s() fails in writing reg %d\n",
-                       __func__, REG_VSET0 + vset_id);
+               dev_err(tps->dev, "%s(): register %d read failed with err %d\n",
+                       __func__, REG_VSET0 + tps->curr_vset_id, ret);
                return ret;
        }
-       tps->curr_vset_vsel[vset_id] = data & tps->voltage_reg_mask;
-       if (pdata->en_force_pwm)
-               data |= BIT(7);
-       else
-               data &= ~BIT(7);
-       ret = regmap_write(tps->regmap, REG_VSET0 + vset_id, data);
-       if (ret < 0)
-               dev_err(tps->dev, "%s() fails in writing reg %d\n",
-                               __func__, REG_VSET0 + vset_id);
-       return ret;
+       return (data & FORCE_PWM_ENABLE) ?
+                               REGULATOR_MODE_FAST : REGULATOR_MODE_NORMAL;
 }
 
-static int tps62360_init_dcdc(struct tps62360_chip *tps,
+static struct regulator_ops tps62360_dcdc_ops = {
+       .get_voltage_sel        = tps62360_dcdc_get_voltage_sel,
+       .set_voltage            = tps62360_dcdc_set_voltage,
+       .list_voltage           = tps62360_dcdc_list_voltage,
+       .set_voltage_time_sel   = tps62360_set_voltage_time_sel,
+       .set_mode               = tps62360_set_mode,
+       .get_mode               = tps62360_get_mode,
+};
+
+static int __devinit tps62360_init_dcdc(struct tps62360_chip *tps,
                struct tps62360_regulator_platform_data *pdata)
 {
        int ret;
-       int i;
+       unsigned int ramp_ctrl;
 
-       /* Initailize internal pull up/down control */
+       /* Initialize internal pull up/down control */
        if (tps->en_internal_pulldn)
                ret = regmap_write(tps->regmap, REG_CONTROL, 0xE0);
        else
                ret = regmap_write(tps->regmap, REG_CONTROL, 0x0);
        if (ret < 0) {
-               dev_err(tps->dev, "%s() fails in writing reg %d\n",
-                       __func__, REG_CONTROL);
+               dev_err(tps->dev,
+                       "%s(): register %d write failed with err %d\n",
+                       __func__, REG_CONTROL, ret);
                return ret;
        }
 
-       /* Initailize force PWM mode */
-       if (tps->valid_gpios) {
-               for (i = 0; i < 4; ++i) {
-                       ret = tps62360_init_force_pwm(tps, pdata, i);
-                       if (ret < 0)
-                               return ret;
-               }
-       } else {
-               ret = tps62360_init_force_pwm(tps, pdata, tps->curr_vset_id);
-               if (ret < 0)
-                       return ret;
-       }
-
        /* Reset output discharge path to reduce power consumption */
        ret = regmap_update_bits(tps->regmap, REG_RAMPCTRL, BIT(2), 0);
-       if (ret < 0)
-               dev_err(tps->dev, "%s() fails in updating reg %d\n",
-                       __func__, REG_RAMPCTRL);
+       if (ret < 0) {
+               dev_err(tps->dev,
+                       "%s(): register %d update failed with err %d\n",
+                       __func__, REG_RAMPCTRL, ret);
+               return ret;
+       }
+
+       /* Get ramp value from ramp control register */
+       ret = regmap_read(tps->regmap, REG_RAMPCTRL, &ramp_ctrl);
+       if (ret < 0) {
+               dev_err(tps->dev,
+                       "%s(): register %d read failed with err %d\n",
+                       __func__, REG_RAMPCTRL, ret);
+               return ret;
+       }
+       ramp_ctrl = (ramp_ctrl >> 4) & 0x7;
+
+       /* ramp mV/us = 32/(2^ramp_ctrl) */
+       tps->change_uv_per_us = DIV_ROUND_UP(32000, BIT(ramp_ctrl));
        return ret;
 }
 
@@ -280,19 +341,18 @@ static int __devinit tps62360_probe(struct i2c_client *client,
 
        pdata = client->dev.platform_data;
        if (!pdata) {
-               dev_err(&client->dev, "%s() Err: Platform data not found\n",
+               dev_err(&client->dev, "%s(): Platform data not found\n",
                                                __func__);
                return -EIO;
        }
 
        tps = devm_kzalloc(&client->dev, sizeof(*tps), GFP_KERNEL);
        if (!tps) {
-               dev_err(&client->dev, "%s() Err: Memory allocation fails\n",
+               dev_err(&client->dev, "%s(): Memory allocation failed\n",
                                                __func__);
                return -ENOMEM;
        }
 
-       tps->en_force_pwm = pdata->en_force_pwm;
        tps->en_discharge = pdata->en_discharge;
        tps->en_internal_pulldn = pdata->en_internal_pulldn;
        tps->vsel0_gpio = pdata->vsel0_gpio;
@@ -324,8 +384,9 @@ static int __devinit tps62360_probe(struct i2c_client *client,
        tps->regmap = devm_regmap_init_i2c(client, &tps62360_regmap_config);
        if (IS_ERR(tps->regmap)) {
                ret = PTR_ERR(tps->regmap);
-               dev_err(&client->dev, "%s() Err: Failed to allocate register"
-                       "map: %d\n", __func__, ret);
+               dev_err(&client->dev,
+                       "%s(): regmap allocation failed with err %d\n",
+                       __func__, ret);
                return ret;
        }
        i2c_set_clientdata(client, tps);
@@ -336,35 +397,26 @@ static int __devinit tps62360_probe(struct i2c_client *client,
        tps->valid_gpios = false;
 
        if (gpio_is_valid(tps->vsel0_gpio) && gpio_is_valid(tps->vsel1_gpio)) {
-               ret = gpio_request(tps->vsel0_gpio, "tps62360-vsel0");
+               int gpio_flags;
+               gpio_flags = (pdata->vsel0_def_state) ?
+                               GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
+               ret = gpio_request_one(tps->vsel0_gpio,
+                               gpio_flags, "tps62360-vsel0");
                if (ret) {
                        dev_err(&client->dev,
-                               "Err: Could not obtain vsel0 GPIO %d: %d\n",
-                                               tps->vsel0_gpio, ret);
-                       goto err_gpio0;
-               }
-               ret = gpio_direction_output(tps->vsel0_gpio,
-                                       pdata->vsel0_def_state);
-               if (ret) {
-                       dev_err(&client->dev, "Err: Could not set direction of"
-                               "vsel0 GPIO %d: %d\n", tps->vsel0_gpio, ret);
-                       gpio_free(tps->vsel0_gpio);
+                               "%s(): Could not obtain vsel0 GPIO %d: %d\n",
+                               __func__, tps->vsel0_gpio, ret);
                        goto err_gpio0;
                }
 
-               ret = gpio_request(tps->vsel1_gpio, "tps62360-vsel1");
+               gpio_flags = (pdata->vsel1_def_state) ?
+                               GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW;
+               ret = gpio_request_one(tps->vsel1_gpio,
+                               gpio_flags, "tps62360-vsel1");
                if (ret) {
                        dev_err(&client->dev,
-                               "Err: Could not obtain vsel1 GPIO %d: %d\n",
-                                               tps->vsel1_gpio, ret);
-                       goto err_gpio1;
-               }
-               ret = gpio_direction_output(tps->vsel1_gpio,
-                                       pdata->vsel1_def_state);
-               if (ret) {
-                       dev_err(&client->dev, "Err: Could not set direction of"
-                               "vsel1 GPIO %d: %d\n", tps->vsel1_gpio, ret);
-                       gpio_free(tps->vsel1_gpio);
+                               "%s(): Could not obtain vsel1 GPIO %d: %d\n",
+                               __func__, tps->vsel1_gpio, ret);
                        goto err_gpio1;
                }
                tps->valid_gpios = true;
@@ -381,7 +433,7 @@ static int __devinit tps62360_probe(struct i2c_client *client,
 
        ret = tps62360_init_dcdc(tps, pdata);
        if (ret < 0) {
-               dev_err(tps->dev, "%s() Err: Init fails with = %d\n",
+               dev_err(tps->dev, "%s(): Init failed with err = %d\n",
                                __func__, ret);
                goto err_init;
        }
@@ -390,8 +442,9 @@ static int __devinit tps62360_probe(struct i2c_client *client,
        rdev = regulator_register(&tps->desc, &client->dev,
                                &pdata->reg_init_data, tps, NULL);
        if (IS_ERR(rdev)) {
-               dev_err(tps->dev, "%s() Err: Failed to register %s\n",
-                               __func__, id->name);
+               dev_err(tps->dev,
+                       "%s(): regulator register failed with err %s\n",
+                       __func__, id->name);
                ret = PTR_ERR(rdev);
                goto err_init;
        }
@@ -440,8 +493,9 @@ static void tps62360_shutdown(struct i2c_client *client)
        /* Configure the output discharge path */
        st = regmap_update_bits(tps->regmap, REG_RAMPCTRL, BIT(2), BIT(2));
        if (st < 0)
-               dev_err(tps->dev, "%s() fails in updating reg %d\n",
-                       __func__, REG_RAMPCTRL);
+               dev_err(tps->dev,
+                       "%s(): register %d update failed with err %d\n",
+                       __func__, REG_RAMPCTRL, st);
 }
 
 static const struct i2c_device_id tps62360_id[] = {