korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 05:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

regulator: Add REGULATOR_LINEAR_RANGE macro

Browse Source 
Add REGULATOR_LINEAR_RANGE macro and convert regulator drivers to use it.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Axel Lin 2013-10-11 09:32:18 +08:00 committed by Mark Brown
parent e277e65680
commit 8828bae464
10 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/regulator/88pm800.c
View File

@ -141,16 +141,14 @@ struct pm800_regulators {
/* Ranges are sorted in ascending order. */
static const struct regulator_linear_range buck1_volt_range[] = {
{ .min_uV = 600000, .min_sel = 0, .max_sel = 0x4f, .uV_step = 12500 },
{ .min_uV = 1600000, .min_sel = 0x50, .max_sel = 0x54,
.uV_step = 50000 },
REGULATOR_LINEAR_RANGE(600000, 0, 0x4f, 12500),
REGULATOR_LINEAR_RANGE(1600000, 0x50, 0x54, 50000),
};
/* BUCK 2~5 have same ranges. */
static const struct regulator_linear_range buck2_5_volt_range[] = {
{ .min_uV = 600000, .min_sel = 0, .max_sel = 0x4f, .uV_step = 12500 },
{ .min_uV = 1600000, .min_sel = 0x50, .max_sel = 0x72,
.uV_step = 50000 },
REGULATOR_LINEAR_RANGE(600000, 0, 0x4f, 12500),
REGULATOR_LINEAR_RANGE(1600000, 0x50, 0x72, 50000),
};
static const unsigned int ldo1_volt_table[] = {

18
drivers/regulator/as3711-regulator.c
View File

@ -117,23 +117,19 @@ static struct regulator_ops as3711_dldo_ops = {
};
static const struct regulator_linear_range as3711_sd_ranges[] = {
{ .min_uV = 612500, .min_sel = 0x1, .max_sel = 0x40, .uV_step = 12500 },
{ .min_uV = 1425000, .min_sel = 0x41, .max_sel = 0x70,
.uV_step = 25000 },
{ .min_uV = 2650000, .min_sel = 0x71, .max_sel = 0x7f,
.uV_step = 50000 },
REGULATOR_LINEAR_RANGE(612500, 0x1, 0x40, 12500),
REGULATOR_LINEAR_RANGE(1425000, 0x41, 0x70, 25000),
REGULATOR_LINEAR_RANGE(2650000, 0x71, 0x7f, 50000),
};
static const struct regulator_linear_range as3711_aldo_ranges[] = {
{ .min_uV = 1200000, .min_sel = 0, .max_sel = 0xf, .uV_step = 50000 },
{ .min_uV = 1800000, .min_sel = 0x10, .max_sel = 0x1f,
.uV_step = 100000 },
REGULATOR_LINEAR_RANGE(1200000, 0, 0xf, 50000),
REGULATOR_LINEAR_RANGE(1800000, 0x10, 0x1f, 100000),
};
static const struct regulator_linear_range as3711_dldo_ranges[] = {
{ .min_uV = 900000, .min_sel = 0, .max_sel = 0x10, .uV_step = 50000 },
{ .min_uV = 1750000, .min_sel = 0x20, .max_sel = 0x3f,
.uV_step = 50000 },
REGULATOR_LINEAR_RANGE(900000, 0, 0x10, 50000),
REGULATOR_LINEAR_RANGE(1750000, 0x20, 0x3f, 50000),
};
#define AS3711_REG(_id, _en_reg, _en_bit, _vmask, _vshift, _min_uV, _max_uV, _sfx) \

18
drivers/regulator/as3722-regulator.c
View File

@ -435,17 +435,9 @@ static struct regulator_ops as3722_ldo3_extcntrl_ops = {
.get_current_limit = as3722_ldo3_get_current_limit,
};
#define regulator_lin_range(_min_sel, _max_sel, _min_uV, _step_uV) \
{ \
.min_sel = _min_sel, \
.max_sel = _max_sel, \
.uV_step = _step_uV, \
.min_uV = _min_uV, \
}
static const struct regulator_linear_range as3722_ldo_ranges[] = {
regulator_lin_range(0x01, 0x24, 825000, 25000),
regulator_lin_range(0x40, 0x7F, 1725000, 25000),
REGULATOR_LINEAR_RANGE(825000, 0x01, 0x24, 25000),
REGULATOR_LINEAR_RANGE(1725000, 0x40, 0x7F, 25000),
};
static struct regulator_ops as3722_ldo_ops = {
@ -604,9 +596,9 @@ static int as3722_sd016_set_current_limit(struct regulator_dev *rdev,
}
static const struct regulator_linear_range as3722_sd2345_ranges[] = {
regulator_lin_range(0x01, 0x40, 612500, 12500),
regulator_lin_range(0x41, 0x70, 1425000, 25000),
regulator_lin_range(0x71, 0x7F, 2650000, 50000),
REGULATOR_LINEAR_RANGE(612500, 0x01, 0x40, 12500),
REGULATOR_LINEAR_RANGE(1425000, 0x41, 0x70, 25000),
REGULATOR_LINEAR_RANGE(2650000, 0x71, 0x7F, 50000),
};
static struct regulator_ops as3722_sd016_ops = {

4
drivers/regulator/da903x.c
View File

@ -253,8 +253,8 @@ static int da9034_set_dvc_voltage_sel(struct regulator_dev *rdev,
}
static const struct regulator_linear_range da9034_ldo12_ranges[] = {
{ .min_uV = 1700000, .min_sel = 0, .max_sel = 7, .uV_step = 50000 },
{ .min_uV = 2700000, .min_sel = 8, .max_sel = 15, .uV_step = 50000 },
REGULATOR_LINEAR_RANGE(1700000, 0, 7, 50000),
REGULATOR_LINEAR_RANGE(2700000, 8, 15, 50000),
};
static struct regulator_ops da903x_regulator_ldo_ops = {

16
drivers/regulator/tps65217-regulator.c
View File

@ -52,17 +52,17 @@ static const unsigned int LDO1_VSEL_table[] = {
};
static const struct regulator_linear_range tps65217_uv1_ranges[] = {
{ .min_uV = 900000, .min_sel = 0, .max_sel = 24, .uV_step = 25000 },
{ .min_uV = 1550000, .min_sel = 25, .max_sel = 30, .uV_step = 50000 },
{ .min_uV = 1850000, .min_sel = 31, .max_sel = 52, .uV_step = 50000 },
{ .min_uV = 3000000, .min_sel = 53, .max_sel = 55, .uV_step = 100000 },
{ .min_uV = 3300000, .min_sel = 56, .max_sel = 62, .uV_step = 0 },
REGULATOR_LINEAR_RANGE(900000, 0, 24, 25000),
REGULATOR_LINEAR_RANGE(1550000, 25, 30, 50000),
REGULATOR_LINEAR_RANGE(1850000, 31, 52, 50000),
REGULATOR_LINEAR_RANGE(3000000, 53, 55, 100000),
REGULATOR_LINEAR_RANGE(3300000, 56, 62, 0),
};
static const struct regulator_linear_range tps65217_uv2_ranges[] = {
{ .min_uV = 1500000, .min_sel = 0, .max_sel = 8, .uV_step = 50000 },
{ .min_uV = 2000000, .min_sel = 9, .max_sel = 13, .uV_step = 100000 },
{ .min_uV = 2450000, .min_sel = 14, .max_sel = 31, .uV_step = 50000 },
REGULATOR_LINEAR_RANGE(1500000, 0, 8, 50000),
REGULATOR_LINEAR_RANGE(2000000, 9, 13, 100000),
REGULATOR_LINEAR_RANGE(2450000, 14, 31, 50000),
};
static int tps65217_pmic_enable(struct regulator_dev *dev)

6
drivers/regulator/tps65912-regulator.c
View File

@ -119,9 +119,9 @@ struct tps65912_reg {
};
static const struct regulator_linear_range tps65912_ldo_ranges[] = {
{ .min_uV = 800000, .min_sel = 0, .max_sel = 32, .uV_step = 25000 },
{ .min_uV = 1650000, .min_sel = 33, .max_sel = 60, .uV_step = 50000 },
{ .min_uV = 3100000, .min_sel = 61, .max_sel = 63, .uV_step = 100000 },
REGULATOR_LINEAR_RANGE(800000, 0, 32, 25000),
REGULATOR_LINEAR_RANGE(1650000, 33, 60, 50000),
REGULATOR_LINEAR_RANGE(3100000, 61, 63, 100000),
};
static int tps65912_get_range(struct tps65912_reg *pmic, int id)

8
drivers/regulator/wm831x-ldo.c
View File

@ -63,8 +63,8 @@ static irqreturn_t wm831x_ldo_uv_irq(int irq, void *data)
*/
static const struct regulator_linear_range wm831x_gp_ldo_ranges[] = {
{ .min_uV = 900000, .min_sel = 0, .max_sel = 14, .uV_step = 50000 },
{ .min_uV = 1700000, .min_sel = 15, .max_sel = 31, .uV_step = 100000 },
REGULATOR_LINEAR_RANGE(900000, 0, 14, 50000),
REGULATOR_LINEAR_RANGE(1700000, 15, 31, 100000),
};
static int wm831x_gp_ldo_set_suspend_voltage(struct regulator_dev *rdev,
@ -330,8 +330,8 @@ static struct platform_driver wm831x_gp_ldo_driver = {
*/
static const struct regulator_linear_range wm831x_aldo_ranges[] = {
{ .min_uV = 1000000, .min_sel = 0, .max_sel = 12, .uV_step = 50000 },
{ .min_uV = 1700000, .min_sel = 13, .max_sel = 31, .uV_step = 100000 },
REGULATOR_LINEAR_RANGE(1000000, 0, 12, 50000),
REGULATOR_LINEAR_RANGE(1700000, 13, 31, 100000),
};
static int wm831x_aldo_set_suspend_voltage(struct regulator_dev *rdev,

4
drivers/regulator/wm8350-regulator.c
View File

@ -543,8 +543,8 @@ static int wm8350_dcdc_set_suspend_mode(struct regulator_dev *rdev,
}
static const struct regulator_linear_range wm8350_ldo_ranges[] = {
{ .min_uV = 900000, .min_sel = 0, .max_sel = 15, .uV_step = 50000 },
{ .min_uV = 1800000, .min_sel = 16, .max_sel = 31, .uV_step = 100000 },
REGULATOR_LINEAR_RANGE(900000, 0, 15, 50000),
REGULATOR_LINEAR_RANGE(1800000, 16, 31, 100000),
};
static int wm8350_ldo_set_suspend_voltage(struct regulator_dev *rdev, int uV)

4
drivers/regulator/wm8400-regulator.c
View File

@ -20,8 +20,8 @@
#include <linux/mfd/wm8400-private.h>
static const struct regulator_linear_range wm8400_ldo_ranges[] = {
{ .min_uV = 900000, .min_sel = 0, .max_sel = 14, .uV_step = 50000 },
{ .min_uV = 1700000, .min_sel = 15, .max_sel = 31, .uV_step = 100000 },
REGULATOR_LINEAR_RANGE(900000, 0, 14, 50000),
REGULATOR_LINEAR_RANGE(1700000, 15, 31, 100000),
};
static struct regulator_ops wm8400_ldo_ops = {

9
include/linux/regulator/driver.h
View File

@ -57,6 +57,15 @@ struct regulator_linear_range {
unsigned int uV_step;
};
/* Initialize struct regulator_linear_range */
#define REGULATOR_LINEAR_RANGE(_min_uV, _min_sel, _max_sel, _step_uV) \
{ \
.min_uV = _min_uV, \
.min_sel = _min_sel, \
.max_sel = _max_sel, \
.uV_step = _step_uV, \
}
/**
* struct regulator_ops - regulator operations.
*