← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/regulator/wm8400-regulator.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/regulator/wm8400-regulator.c
55
55
                return 1600000 + ((selector - 14) * 100000);
56
56
}
57
57
 
58
 
static int wm8400_ldo_get_voltage(struct regulator_dev *dev)
 
58
static int wm8400_ldo_get_voltage_sel(struct regulator_dev *dev)
59
59
{
60
60
        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
61
61
        u16 val;
63
63
        val = wm8400_reg_read(wm8400, WM8400_LDO1_CONTROL + rdev_get_id(dev));
64
64
        val &= WM8400_LDO1_VSEL_MASK;
65
65
 
66
 
        return wm8400_ldo_list_voltage(dev, val);
 
66
        return val;
67
67
}
68
68
 
69
69
static int wm8400_ldo_set_voltage(struct regulator_dev *dev,
104
104
        .enable = wm8400_ldo_enable,
105
105
        .disable = wm8400_ldo_disable,
106
106
        .list_voltage = wm8400_ldo_list_voltage,
107
 
        .get_voltage = wm8400_ldo_get_voltage,
 
107
        .get_voltage_sel = wm8400_ldo_get_voltage_sel,
108
108
        .set_voltage = wm8400_ldo_set_voltage,
109
109
};
110
110
 
145
145
        return 850000 + (selector * 25000);
146
146
}
147
147
 
148
 
static int wm8400_dcdc_get_voltage(struct regulator_dev *dev)
 
148
static int wm8400_dcdc_get_voltage_sel(struct regulator_dev *dev)
149
149
{
150
150
        struct wm8400 *wm8400 = rdev_get_drvdata(dev);
151
151
        u16 val;
154
154
        val = wm8400_reg_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset);
155
155
        val &= WM8400_DC1_VSEL_MASK;
156
156
 
157
 
        return 850000 + (25000 * val);
 
157
        return val;
158
158
}
159
159
 
160
160
static int wm8400_dcdc_set_voltage(struct regulator_dev *dev,
261
261
        .enable = wm8400_dcdc_enable,
262
262
        .disable = wm8400_dcdc_disable,
263
263
        .list_voltage = wm8400_dcdc_list_voltage,
264
 
        .get_voltage = wm8400_dcdc_get_voltage,
 
264
        .get_voltage_sel = wm8400_dcdc_get_voltage_sel,
265
265
        .set_voltage = wm8400_dcdc_set_voltage,
266
266
        .get_mode = wm8400_dcdc_get_mode,
267
267
        .set_mode = wm8400_dcdc_set_mode,