Merge remote-tracking branches 'regulator/topic/fan53555', 'regulator/topic/lp3971', 'regulator/topic/lp3972', 'regulator/topic/lp873x' and 'regulator/topic/max77620' into regulator-next
This commit is contained in:
Mark Brown
Коммит
ce59dedfef
|
|
@ -94,6 +94,28 @@ Following are additional properties:
|
|||
This is applicable if suspend state
|
||||
FPS source is selected as FPS0, FPS1 or
|
||||
FPS2.
|
||||
- maxim,ramp-rate-setting: integer, ramp rate(uV/us) setting to be
|
||||
configured to the device.
|
||||
The platform may have different ramp
|
||||
rate than advertised ramp rate if it has
|
||||
design variation from Maxim's
|
||||
recommended. On this case, platform
|
||||
specific ramp rate is used for ramp time
|
||||
calculation and this property is used
|
||||
for device register configurations.
|
||||
The measured ramp rate of platform is
|
||||
provided by the regulator-ramp-delay
|
||||
as described in <devicetree/bindings/
|
||||
regulator/regulator.txt>.
|
||||
Maxim Max77620 supports following ramp
|
||||
delay:
|
||||
SD: 13.75mV/us, 27.5mV/us, 55mV/us
|
||||
LDOs: 5mV/us, 100mV/us
|
||||
|
||||
Note: If the measured ramp delay is same as advertised ramp delay then it is not
|
||||
required to provide the ramp delay with property "maxim,ramp-rate-setting". The
|
||||
ramp rate can be provided by the regulator-ramp-delay which will be used for
|
||||
ramp time calculation for voltage change as well as for device configuration.
|
||||
|
||||
Example:
|
||||
--------
|
||||
|
|
|
|||
|
|
@ -321,6 +321,15 @@ config REGULATOR_LP872X
|
|||
help
|
||||
This driver supports LP8720/LP8725 PMIC
|
||||
|
||||
config REGULATOR_LP873X
|
||||
tristate "TI LP873X Power regulators"
|
||||
depends on MFD_LP873X && OF
|
||||
help
|
||||
This driver supports LP873X voltage regulator chips. LP873X
|
||||
provides two step-down converters and two general-purpose LDO
|
||||
voltage regulators. It supports software based voltage control
|
||||
for different voltage domains
|
||||
|
||||
config REGULATOR_LP8755
|
||||
tristate "TI LP8755 High Performance PMU driver"
|
||||
depends on I2C
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ obj-$(CONFIG_REGULATOR_LM363X) += lm363x-regulator.o
|
|||
obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
|
||||
obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o
|
||||
obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o
|
||||
obj-$(CONFIG_REGULATOR_LP873X) += lp873x-regulator.o
|
||||
obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o
|
||||
obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o
|
||||
obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o
|
||||
|
|
|
|||
|
|
@ -65,6 +65,13 @@ enum {
|
|||
FAN53555_CHIP_ID_03,
|
||||
FAN53555_CHIP_ID_04,
|
||||
FAN53555_CHIP_ID_05,
|
||||
FAN53555_CHIP_ID_08 = 8,
|
||||
};
|
||||
|
||||
/* IC mask revision */
|
||||
enum {
|
||||
FAN53555_CHIP_REV_00 = 0x3,
|
||||
FAN53555_CHIP_REV_13 = 0xf,
|
||||
};
|
||||
|
||||
enum {
|
||||
|
|
@ -217,9 +224,26 @@ static int fan53555_voltages_setup_fairchild(struct fan53555_device_info *di)
|
|||
/* Init voltage range and step */
|
||||
switch (di->chip_id) {
|
||||
case FAN53555_CHIP_ID_00:
|
||||
switch (di->chip_rev) {
|
||||
case FAN53555_CHIP_REV_00:
|
||||
di->vsel_min = 600000;
|
||||
di->vsel_step = 10000;
|
||||
break;
|
||||
case FAN53555_CHIP_REV_13:
|
||||
di->vsel_min = 800000;
|
||||
di->vsel_step = 10000;
|
||||
break;
|
||||
default:
|
||||
dev_err(di->dev,
|
||||
"Chip ID %d with rev %d not supported!\n",
|
||||
di->chip_id, di->chip_rev);
|
||||
return -EINVAL;
|
||||
}
|
||||
break;
|
||||
case FAN53555_CHIP_ID_01:
|
||||
case FAN53555_CHIP_ID_03:
|
||||
case FAN53555_CHIP_ID_05:
|
||||
case FAN53555_CHIP_ID_08:
|
||||
di->vsel_min = 600000;
|
||||
di->vsel_step = 10000;
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -365,8 +365,8 @@ static int lp3971_set_bits(struct lp3971 *lp3971, u8 reg, u16 mask, u16 val)
|
|||
mutex_lock(&lp3971->io_lock);
|
||||
|
||||
ret = lp3971_i2c_read(lp3971->i2c, reg, 1, &tmp);
|
||||
tmp = (tmp & ~mask) | val;
|
||||
if (ret == 0) {
|
||||
tmp = (tmp & ~mask) | val;
|
||||
ret = lp3971_i2c_write(lp3971->i2c, reg, 1, &tmp);
|
||||
dev_dbg(lp3971->dev, "reg write 0x%02x -> 0x%02x\n", (int)reg,
|
||||
(unsigned)val&0xff);
|
||||
|
|
|
|||
|
|
@ -211,8 +211,8 @@ static int lp3972_set_bits(struct lp3972 *lp3972, u8 reg, u16 mask, u16 val)
|
|||
mutex_lock(&lp3972->io_lock);
|
||||
|
||||
ret = lp3972_i2c_read(lp3972->i2c, reg, 1, &tmp);
|
||||
tmp = (tmp & ~mask) | val;
|
||||
if (ret == 0) {
|
||||
tmp = (tmp & ~mask) | val;
|
||||
ret = lp3972_i2c_write(lp3972->i2c, reg, 1, &tmp);
|
||||
dev_dbg(lp3972->dev, "reg write 0x%02x -> 0x%02x\n", (int)reg,
|
||||
(unsigned)val & 0xff);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,241 @@
|
|||
/*
|
||||
* Regulator driver for LP873X PMIC
|
||||
*
|
||||
* Copyright (C) 2016 Texas Instruments Incorporated - http://www.ti.com/
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
||||
* kind, whether expressed or implied; without even the implied warranty
|
||||
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License version 2 for more details.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/regmap.h>
|
||||
|
||||
#include <linux/mfd/lp873x.h>
|
||||
|
||||
#define LP873X_REGULATOR(_name, _id, _of, _ops, _n, _vr, _vm, _er, _em, \
|
||||
_delay, _lr, _nlr, _cr) \
|
||||
[_id] = { \
|
||||
.desc = { \
|
||||
.name = _name, \
|
||||
.id = _id, \
|
||||
.of_match = of_match_ptr(_of), \
|
||||
.regulators_node = of_match_ptr("regulators"),\
|
||||
.ops = &_ops, \
|
||||
.n_voltages = _n, \
|
||||
.type = REGULATOR_VOLTAGE, \
|
||||
.owner = THIS_MODULE, \
|
||||
.vsel_reg = _vr, \
|
||||
.vsel_mask = _vm, \
|
||||
.enable_reg = _er, \
|
||||
.enable_mask = _em, \
|
||||
.ramp_delay = _delay, \
|
||||
.linear_ranges = _lr, \
|
||||
.n_linear_ranges = _nlr, \
|
||||
}, \
|
||||
.ctrl2_reg = _cr, \
|
||||
}
|
||||
|
||||
struct lp873x_regulator {
|
||||
struct regulator_desc desc;
|
||||
unsigned int ctrl2_reg;
|
||||
};
|
||||
|
||||
static const struct lp873x_regulator regulators[];
|
||||
|
||||
static const struct regulator_linear_range buck0_buck1_ranges[] = {
|
||||
REGULATOR_LINEAR_RANGE(0, 0x0, 0x13, 0),
|
||||
REGULATOR_LINEAR_RANGE(700000, 0x14, 0x17, 10000),
|
||||
REGULATOR_LINEAR_RANGE(735000, 0x18, 0x9d, 5000),
|
||||
REGULATOR_LINEAR_RANGE(1420000, 0x9e, 0xff, 20000),
|
||||
};
|
||||
|
||||
static const struct regulator_linear_range ldo0_ldo1_ranges[] = {
|
||||
REGULATOR_LINEAR_RANGE(800000, 0x0, 0x19, 100000),
|
||||
};
|
||||
|
||||
static unsigned int lp873x_buck_ramp_delay[] = {
|
||||
30000, 15000, 10000, 7500, 3800, 1900, 940, 470
|
||||
};
|
||||
|
||||
/* LP873X BUCK current limit */
|
||||
static const unsigned int lp873x_buck_uA[] = {
|
||||
1500000, 2000000, 2500000, 3000000, 3500000, 4000000,
|
||||
};
|
||||
|
||||
static int lp873x_buck_set_ramp_delay(struct regulator_dev *rdev,
|
||||
int ramp_delay)
|
||||
{
|
||||
int id = rdev_get_id(rdev);
|
||||
struct lp873x *lp873 = rdev_get_drvdata(rdev);
|
||||
unsigned int reg;
|
||||
int ret;
|
||||
|
||||
if (ramp_delay <= 470)
|
||||
reg = 7;
|
||||
else if (ramp_delay <= 940)
|
||||
reg = 6;
|
||||
else if (ramp_delay <= 1900)
|
||||
reg = 5;
|
||||
else if (ramp_delay <= 3800)
|
||||
reg = 4;
|
||||
else if (ramp_delay <= 7500)
|
||||
reg = 3;
|
||||
else if (ramp_delay <= 10000)
|
||||
reg = 2;
|
||||
else if (ramp_delay <= 15000)
|
||||
reg = 1;
|
||||
else
|
||||
reg = 0;
|
||||
|
||||
ret = regmap_update_bits(lp873->regmap, regulators[id].ctrl2_reg,
|
||||
LP873X_BUCK0_CTRL_2_BUCK0_SLEW_RATE,
|
||||
reg << __ffs(LP873X_BUCK0_CTRL_2_BUCK0_SLEW_RATE));
|
||||
if (ret) {
|
||||
dev_err(lp873->dev, "SLEW RATE write failed: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
rdev->constraints->ramp_delay = lp873x_buck_ramp_delay[reg];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int lp873x_buck_set_current_limit(struct regulator_dev *rdev,
|
||||
int min_uA, int max_uA)
|
||||
{
|
||||
int id = rdev_get_id(rdev);
|
||||
struct lp873x *lp873 = rdev_get_drvdata(rdev);
|
||||
int i;
|
||||
|
||||
for (i = ARRAY_SIZE(lp873x_buck_uA) - 1; i >= 0; i--) {
|
||||
if (lp873x_buck_uA[i] >= min_uA &&
|
||||
lp873x_buck_uA[i] <= max_uA)
|
||||
return regmap_update_bits(lp873->regmap,
|
||||
regulators[id].ctrl2_reg,
|
||||
LP873X_BUCK0_CTRL_2_BUCK0_ILIM,
|
||||
i << __ffs(LP873X_BUCK0_CTRL_2_BUCK0_ILIM));
|
||||
}
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int lp873x_buck_get_current_limit(struct regulator_dev *rdev)
|
||||
{
|
||||
int id = rdev_get_id(rdev);
|
||||
struct lp873x *lp873 = rdev_get_drvdata(rdev);
|
||||
int ret;
|
||||
unsigned int val;
|
||||
|
||||
ret = regmap_read(lp873->regmap, regulators[id].ctrl2_reg, &val);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
val = (val & LP873X_BUCK0_CTRL_2_BUCK0_ILIM) >>
|
||||
__ffs(LP873X_BUCK0_CTRL_2_BUCK0_ILIM);
|
||||
|
||||
return (val < ARRAY_SIZE(lp873x_buck_uA)) ?
|
||||
lp873x_buck_uA[val] : -EINVAL;
|
||||
}
|
||||
|
||||
/* Operations permitted on BUCK0, BUCK1 */
|
||||
static struct regulator_ops lp873x_buck01_ops = {
|
||||
.is_enabled = regulator_is_enabled_regmap,
|
||||
.enable = regulator_enable_regmap,
|
||||
.disable = regulator_disable_regmap,
|
||||
.get_voltage_sel = regulator_get_voltage_sel_regmap,
|
||||
.set_voltage_sel = regulator_set_voltage_sel_regmap,
|
||||
.list_voltage = regulator_list_voltage_linear_range,
|
||||
.map_voltage = regulator_map_voltage_linear_range,
|
||||
.set_voltage_time_sel = regulator_set_voltage_time_sel,
|
||||
.set_ramp_delay = lp873x_buck_set_ramp_delay,
|
||||
.set_current_limit = lp873x_buck_set_current_limit,
|
||||
.get_current_limit = lp873x_buck_get_current_limit,
|
||||
};
|
||||
|
||||
/* Operations permitted on LDO0 and LDO1 */
|
||||
static struct regulator_ops lp873x_ldo01_ops = {
|
||||
.is_enabled = regulator_is_enabled_regmap,
|
||||
.enable = regulator_enable_regmap,
|
||||
.disable = regulator_disable_regmap,
|
||||
.get_voltage_sel = regulator_get_voltage_sel_regmap,
|
||||
.set_voltage_sel = regulator_set_voltage_sel_regmap,
|
||||
.list_voltage = regulator_list_voltage_linear_range,
|
||||
.map_voltage = regulator_map_voltage_linear_range,
|
||||
};
|
||||
|
||||
static const struct lp873x_regulator regulators[] = {
|
||||
LP873X_REGULATOR("BUCK0", LP873X_BUCK_0, "buck0", lp873x_buck01_ops,
|
||||
256, LP873X_REG_BUCK0_VOUT,
|
||||
LP873X_BUCK0_VOUT_BUCK0_VSET, LP873X_REG_BUCK0_CTRL_1,
|
||||
LP873X_BUCK0_CTRL_1_BUCK0_EN, 10000,
|
||||
buck0_buck1_ranges, 4, LP873X_REG_BUCK0_CTRL_2),
|
||||
LP873X_REGULATOR("BUCK1", LP873X_BUCK_1, "buck1", lp873x_buck01_ops,
|
||||
256, LP873X_REG_BUCK1_VOUT,
|
||||
LP873X_BUCK1_VOUT_BUCK1_VSET, LP873X_REG_BUCK1_CTRL_1,
|
||||
LP873X_BUCK1_CTRL_1_BUCK1_EN, 10000,
|
||||
buck0_buck1_ranges, 4, LP873X_REG_BUCK1_CTRL_2),
|
||||
LP873X_REGULATOR("LDO0", LP873X_LDO_0, "ldo0", lp873x_ldo01_ops, 26,
|
||||
LP873X_REG_LDO0_VOUT, LP873X_LDO0_VOUT_LDO0_VSET,
|
||||
LP873X_REG_LDO0_CTRL,
|
||||
LP873X_LDO0_CTRL_LDO0_EN, 0, ldo0_ldo1_ranges, 1,
|
||||
0xFF),
|
||||
LP873X_REGULATOR("LDO1", LP873X_LDO_1, "ldo1", lp873x_ldo01_ops, 26,
|
||||
LP873X_REG_LDO1_VOUT, LP873X_LDO1_VOUT_LDO1_VSET,
|
||||
LP873X_REG_LDO1_CTRL,
|
||||
LP873X_LDO1_CTRL_LDO1_EN, 0, ldo0_ldo1_ranges, 1,
|
||||
0xFF),
|
||||
};
|
||||
|
||||
static int lp873x_regulator_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct lp873x *lp873 = dev_get_drvdata(pdev->dev.parent);
|
||||
struct regulator_config config = { };
|
||||
struct regulator_dev *rdev;
|
||||
int i;
|
||||
|
||||
platform_set_drvdata(pdev, lp873);
|
||||
|
||||
config.dev = &pdev->dev;
|
||||
config.dev->of_node = lp873->dev->of_node;
|
||||
config.driver_data = lp873;
|
||||
config.regmap = lp873->regmap;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(regulators); i++) {
|
||||
rdev = devm_regulator_register(&pdev->dev, ®ulators[i].desc,
|
||||
&config);
|
||||
if (IS_ERR(rdev)) {
|
||||
dev_err(lp873->dev, "failed to register %s regulator\n",
|
||||
pdev->name);
|
||||
return PTR_ERR(rdev);
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct platform_device_id lp873x_regulator_id_table[] = {
|
||||
{ "lp873x-regulator", },
|
||||
{ /* sentinel */ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(platform, lp873x_regulator_id_table);
|
||||
|
||||
static struct platform_driver lp873x_regulator_driver = {
|
||||
.driver = {
|
||||
.name = "lp873x-pmic",
|
||||
},
|
||||
.probe = lp873x_regulator_probe,
|
||||
.id_table = lp873x_regulator_id_table,
|
||||
};
|
||||
module_platform_driver(lp873x_regulator_driver);
|
||||
|
||||
MODULE_AUTHOR("J Keerthy <j-keerthy@ti.com>");
|
||||
MODULE_DESCRIPTION("LP873X voltage regulator driver");
|
||||
MODULE_ALIAS("platform:lp873x-pmic");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
@ -81,6 +81,7 @@ struct max77620_regulator_pdata {
|
|||
int suspend_fps_pd_slot;
|
||||
int suspend_fps_pu_slot;
|
||||
int current_mode;
|
||||
int ramp_rate_setting;
|
||||
};
|
||||
|
||||
struct max77620_regulator {
|
||||
|
|
@ -307,6 +308,43 @@ static int max77620_read_slew_rate(struct max77620_regulator *pmic, int id)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int max77620_set_slew_rate(struct max77620_regulator *pmic, int id,
|
||||
int slew_rate)
|
||||
{
|
||||
struct max77620_regulator_info *rinfo = pmic->rinfo[id];
|
||||
unsigned int val;
|
||||
int ret;
|
||||
u8 mask;
|
||||
|
||||
if (rinfo->type == MAX77620_REGULATOR_TYPE_SD) {
|
||||
if (slew_rate <= 13750)
|
||||
val = 0;
|
||||
else if (slew_rate <= 27500)
|
||||
val = 1;
|
||||
else if (slew_rate <= 55000)
|
||||
val = 2;
|
||||
else
|
||||
val = 3;
|
||||
val <<= MAX77620_SD_SR_SHIFT;
|
||||
mask = MAX77620_SD_SR_MASK;
|
||||
} else {
|
||||
if (slew_rate <= 5000)
|
||||
val = 1;
|
||||
else
|
||||
val = 0;
|
||||
mask = MAX77620_LDO_SLEW_RATE_MASK;
|
||||
}
|
||||
|
||||
ret = regmap_update_bits(pmic->rmap, rinfo->cfg_addr, mask, val);
|
||||
if (ret < 0) {
|
||||
dev_err(pmic->dev, "Regulator %d slew rate set failed: %d\n",
|
||||
id, ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int max77620_init_pmic(struct max77620_regulator *pmic, int id)
|
||||
{
|
||||
struct max77620_regulator_pdata *rpdata = &pmic->reg_pdata[id];
|
||||
|
|
@ -351,6 +389,13 @@ static int max77620_init_pmic(struct max77620_regulator *pmic, int id)
|
|||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (rpdata->ramp_rate_setting) {
|
||||
ret = max77620_set_slew_rate(pmic, id,
|
||||
rpdata->ramp_rate_setting);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -502,35 +547,16 @@ static int max77620_regulator_set_ramp_delay(struct regulator_dev *rdev,
|
|||
{
|
||||
struct max77620_regulator *pmic = rdev_get_drvdata(rdev);
|
||||
int id = rdev_get_id(rdev);
|
||||
struct max77620_regulator_info *rinfo = pmic->rinfo[id];
|
||||
int ret, val;
|
||||
u8 mask;
|
||||
struct max77620_regulator_pdata *rpdata = &pmic->reg_pdata[id];
|
||||
|
||||
if (rinfo->type == MAX77620_REGULATOR_TYPE_SD) {
|
||||
if (ramp_delay <= 13750)
|
||||
val = 0;
|
||||
else if (ramp_delay <= 27500)
|
||||
val = 1;
|
||||
else if (ramp_delay <= 55000)
|
||||
val = 2;
|
||||
else
|
||||
val = 3;
|
||||
val <<= MAX77620_SD_SR_SHIFT;
|
||||
mask = MAX77620_SD_SR_MASK;
|
||||
} else {
|
||||
if (ramp_delay <= 5000)
|
||||
val = 1;
|
||||
else
|
||||
val = 0;
|
||||
mask = MAX77620_LDO_SLEW_RATE_MASK;
|
||||
}
|
||||
/* Device specific ramp rate setting tells that platform has
|
||||
* different ramp rate from advertised value. In this case,
|
||||
* do not configure anything and just return success.
|
||||
*/
|
||||
if (rpdata->ramp_rate_setting)
|
||||
return 0;
|
||||
|
||||
ret = regmap_update_bits(pmic->rmap, rinfo->cfg_addr, mask, val);
|
||||
if (ret < 0)
|
||||
dev_err(pmic->dev, "Reg 0x%02x update failed: %d\n",
|
||||
rinfo->cfg_addr, ret);
|
||||
|
||||
return ret;
|
||||
return max77620_set_slew_rate(pmic, id, ramp_delay);
|
||||
}
|
||||
|
||||
static int max77620_of_parse_cb(struct device_node *np,
|
||||
|
|
@ -563,6 +589,9 @@ static int max77620_of_parse_cb(struct device_node *np,
|
|||
np, "maxim,suspend-fps-power-down-slot", &pval);
|
||||
rpdata->suspend_fps_pd_slot = (!ret) ? pval : -1;
|
||||
|
||||
ret = of_property_read_u32(np, "maxim,ramp-rate-setting", &pval);
|
||||
rpdata->ramp_rate_setting = (!ret) ? pval : 0;
|
||||
|
||||
return max77620_init_pmic(pmic, desc->id);
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче