Skip to content

L
linux
Commit 50a03e35 authored by Beniamino Galvani's avatar Beniamino Galvani Committed by Mark Brown
Browse files
Options

regulator: act8865: prepare support for other act88xx devices 

This patch prepares support for other devices in the act88xx family of
PMUs manufactured by Active-Semi.

http://www.active-semi.com/products/power-management-units/act88xx/Signed-off-by: default avatarBeniamino Galvani <b.galvani@gmail.com>
Tested-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent bbb83f38
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 129 deletions
drivers/regulator/act8865-regulator.c
View file @ 50a03e35
/* /*
* act8865-regulator.c - Voltage regulation for the active-semi ACT8865 * act8865-regulator.c - Voltage regulation for active-semi ACT88xx PMUs
* http://www.active-semi.com/sheets/ACT8865_Datasheet.pdf *
* http://www.active-semi.com/products/power-management-units/act88xx/
* *
* Copyright (C) 2013 Atmel Corporation * Copyright (C) 2013 Atmel Corporation
* *
...@@ -70,7 +71,7 @@ static const struct regmap_config act8865_regmap_config = { ...@@ -70,7 +71,7 @@ static const struct regmap_config act8865_regmap_config = {
.val_bits = 8, .val_bits = 8,
}; };
static const struct regulator_linear_range act8865_volatge_ranges[] = { static const struct regulator_linear_range act8865_voltage_ranges[] = {
REGULATOR_LINEAR_RANGE(600000, 0, 23, 25000), REGULATOR_LINEAR_RANGE(600000, 0, 23, 25000),
REGULATOR_LINEAR_RANGE(1200000, 24, 47, 50000), REGULATOR_LINEAR_RANGE(1200000, 24, 47, 50000),
REGULATOR_LINEAR_RANGE(2400000, 48, 63, 100000), REGULATOR_LINEAR_RANGE(2400000, 48, 63, 100000),
...@@ -86,110 +87,35 @@ static struct regulator_ops act8865_ops = { ...@@ -86,110 +87,35 @@ static struct regulator_ops act8865_ops = {
.is_enabled = regulator_is_enabled_regmap, .is_enabled = regulator_is_enabled_regmap,
}; };
static const struct regulator_desc act8865_reg[] = { #define ACT88xx_REG(_name, _family, _id, _vsel_reg) \
{ [_family##_ID_##_id] = { \
.name = "DCDC_REG1", .name = _name, \
.id = ACT8865_ID_DCDC1, .id = _family##_ID_##_id, \
.ops = &act8865_ops, .type = REGULATOR_VOLTAGE, \
.type = REGULATOR_VOLTAGE, .ops = &act8865_ops, \
.n_voltages = ACT8865_VOLTAGE_NUM, .n_voltages = ACT8865_VOLTAGE_NUM, \
.linear_ranges = act8865_volatge_ranges, .linear_ranges = act8865_voltage_ranges, \
.n_linear_ranges = ARRAY_SIZE(act8865_volatge_ranges), .n_linear_ranges = ARRAY_SIZE(act8865_voltage_ranges), \
.vsel_reg = ACT8865_DCDC1_VSET1, .vsel_reg = _family##_##_id##_##_vsel_reg, \
.vsel_mask = ACT8865_VSEL_MASK, .vsel_mask = ACT8865_VSEL_MASK, \
.enable_reg = ACT8865_DCDC1_CTRL, .enable_reg = _family##_##_id##_CTRL, \
.enable_mask = ACT8865_ENA, .enable_mask = ACT8865_ENA, \
.owner = THIS_MODULE, .owner = THIS_MODULE, \
}, }
{
.name = "DCDC_REG2", static const struct regulator_desc act8865_regulators[] = {
.id = ACT8865_ID_DCDC2, ACT88xx_REG("DCDC_REG1", ACT8865, DCDC1, VSET1),
.ops = &act8865_ops, ACT88xx_REG("DCDC_REG2", ACT8865, DCDC2, VSET1),
.type = REGULATOR_VOLTAGE, ACT88xx_REG("DCDC_REG3", ACT8865, DCDC3, VSET1),
.n_voltages = ACT8865_VOLTAGE_NUM, ACT88xx_REG("LDO_REG1", ACT8865, LDO1, VSET),
.linear_ranges = act8865_volatge_ranges, ACT88xx_REG("LDO_REG2", ACT8865, LDO2, VSET),
.n_linear_ranges = ARRAY_SIZE(act8865_volatge_ranges), ACT88xx_REG("LDO_REG3", ACT8865, LDO3, VSET),
.vsel_reg = ACT8865_DCDC2_VSET1, ACT88xx_REG("LDO_REG4", ACT8865, LDO4, VSET),
.vsel_mask = ACT8865_VSEL_MASK,
.enable_reg = ACT8865_DCDC2_CTRL,
.enable_mask = ACT8865_ENA,
.owner = THIS_MODULE,
},
{
.name = "DCDC_REG3",
.id = ACT8865_ID_DCDC3,
.ops = &act8865_ops,
.type = REGULATOR_VOLTAGE,
.n_voltages = ACT8865_VOLTAGE_NUM,
.linear_ranges = act8865_volatge_ranges,
.n_linear_ranges = ARRAY_SIZE(act8865_volatge_ranges),
.vsel_reg = ACT8865_DCDC3_VSET1,
.vsel_mask = ACT8865_VSEL_MASK,
.enable_reg = ACT8865_DCDC3_CTRL,
.enable_mask = ACT8865_ENA,
.owner = THIS_MODULE,
},
{
.name = "LDO_REG1",
.id = ACT8865_ID_LDO1,
.ops = &act8865_ops,
.type = REGULATOR_VOLTAGE,
.n_voltages = ACT8865_VOLTAGE_NUM,
.linear_ranges = act8865_volatge_ranges,
.n_linear_ranges = ARRAY_SIZE(act8865_volatge_ranges),
.vsel_reg = ACT8865_LDO1_VSET,
.vsel_mask = ACT8865_VSEL_MASK,
.enable_reg = ACT8865_LDO1_CTRL,
.enable_mask = ACT8865_ENA,
.owner = THIS_MODULE,
},
{
.name = "LDO_REG2",
.id = ACT8865_ID_LDO2,
.ops = &act8865_ops,
.type = REGULATOR_VOLTAGE,
.n_voltages = ACT8865_VOLTAGE_NUM,
.linear_ranges = act8865_volatge_ranges,
.n_linear_ranges = ARRAY_SIZE(act8865_volatge_ranges),
.vsel_reg = ACT8865_LDO2_VSET,
.vsel_mask = ACT8865_VSEL_MASK,
.enable_reg = ACT8865_LDO2_CTRL,
.enable_mask = ACT8865_ENA,
.owner = THIS_MODULE,
},
{
.name = "LDO_REG3",
.id = ACT8865_ID_LDO3,
.ops = &act8865_ops,
.type = REGULATOR_VOLTAGE,
.n_voltages = ACT8865_VOLTAGE_NUM,
.linear_ranges = act8865_volatge_ranges,
.n_linear_ranges = ARRAY_SIZE(act8865_volatge_ranges),
.vsel_reg = ACT8865_LDO3_VSET,
.vsel_mask = ACT8865_VSEL_MASK,
.enable_reg = ACT8865_LDO3_CTRL,
.enable_mask = ACT8865_ENA,
.owner = THIS_MODULE,
},
{
.name = "LDO_REG4",
.id = ACT8865_ID_LDO4,
.ops = &act8865_ops,
.type = REGULATOR_VOLTAGE,
.n_voltages = ACT8865_VOLTAGE_NUM,
.linear_ranges = act8865_volatge_ranges,
.n_linear_ranges = ARRAY_SIZE(act8865_volatge_ranges),
.vsel_reg = ACT8865_LDO4_VSET,
.vsel_mask = ACT8865_VSEL_MASK,
.enable_reg = ACT8865_LDO4_CTRL,
.enable_mask = ACT8865_ENA,
.owner = THIS_MODULE,
},
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id act8865_dt_ids[] = { static const struct of_device_id act8865_dt_ids[] = {
{ .compatible = "active-semi,act8865" }, { .compatible = "active-semi,act8865", .data = (void *)ACT8865 },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, act8865_dt_ids); MODULE_DEVICE_TABLE(of, act8865_dt_ids);
...@@ -206,7 +132,9 @@ static struct of_regulator_match act8865_matches[] = { ...@@ -206,7 +132,9 @@ static struct of_regulator_match act8865_matches[] = {
static int act8865_pdata_from_dt(struct device *dev, static int act8865_pdata_from_dt(struct device *dev,
struct device_node **of_node, struct device_node **of_node,
struct act8865_platform_data *pdata) struct act8865_platform_data *pdata,
struct of_regulator_match *matches,
int num_matches)
{ {
int matched, i; int matched, i;
struct device_node *np; struct device_node *np;
...@@ -218,26 +146,25 @@ static int act8865_pdata_from_dt(struct device *dev, ...@@ -218,26 +146,25 @@ static int act8865_pdata_from_dt(struct device *dev,
return -EINVAL; return -EINVAL;
} }
matched = of_regulator_match(dev, np, matched = of_regulator_match(dev, np, matches, num_matches);
act8865_matches, ARRAY_SIZE(act8865_matches));
of_node_put(np); of_node_put(np);
if (matched <= 0) if (matched <= 0)
return matched; return matched;
pdata->regulators = devm_kzalloc(dev, pdata->regulators = devm_kzalloc(dev,
sizeof(struct act8865_regulator_data) * sizeof(struct act8865_regulator_data) *
ARRAY_SIZE(act8865_matches), GFP_KERNEL); num_matches, GFP_KERNEL);
if (!pdata->regulators) if (!pdata->regulators)
return -ENOMEM; return -ENOMEM;
pdata->num_regulators = ARRAY_SIZE(act8865_matches); pdata->num_regulators = num_matches;
regulator = pdata->regulators; regulator = pdata->regulators;
for (i = 0; i < ARRAY_SIZE(act8865_matches); i++) { for (i = 0; i < num_matches; i++) {
regulator->id = i; regulator->id = i;
regulator->name = act8865_matches[i].name; regulator->name = matches[i].name;
regulator->platform_data = act8865_matches[i].init_data; regulator->platform_data = matches[i].init_data;
of_node[i] = act8865_matches[i].of_node; of_node[i] = matches[i].of_node;
regulator++; regulator++;
} }
...@@ -269,34 +196,59 @@ static struct regulator_init_data ...@@ -269,34 +196,59 @@ static struct regulator_init_data
} }
static int act8865_pmic_probe(struct i2c_client *client, static int act8865_pmic_probe(struct i2c_client *client,
const struct i2c_device_id *i2c_id) const struct i2c_device_id *i2c_id)
{ {
struct regulator_dev *rdev; static const struct regulator_desc *regulators;
struct act8865_platform_data pdata_of, *pdata;
struct of_regulator_match *matches;
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct act8865_platform_data *pdata = dev_get_platdata(dev); struct device_node **of_node;
struct regulator_config config = { }; int i, ret, num_regulators;
struct act8865 *act8865; struct act8865 *act8865;
struct device_node *of_node[ACT8865_REG_NUM]; unsigned long type;
int i;
int ret; pdata = dev_get_platdata(dev);
if (dev->of_node && !pdata) { if (dev->of_node && !pdata) {
const struct of_device_id *id; const struct of_device_id *id;
struct act8865_platform_data pdata_of;
id = of_match_device(of_match_ptr(act8865_dt_ids), dev); id = of_match_device(of_match_ptr(act8865_dt_ids), dev);
if (!id) if (!id)
return -ENODEV; return -ENODEV;
ret = act8865_pdata_from_dt(dev, of_node, &pdata_of); type = (unsigned long) id->data;
} else {
type = i2c_id->driver_data;
}
switch (type) {
case ACT8865:
matches = act8865_matches;
regulators = act8865_regulators;
num_regulators = ARRAY_SIZE(act8865_regulators);
break;
default:
dev_err(dev, "invalid device id %lu\n", type);
return -EINVAL;
}
of_node = devm_kzalloc(dev, sizeof(struct device_node *) *
num_regulators, GFP_KERNEL);
if (!of_node)
return -ENOMEM;
if (dev->of_node && !pdata) {
ret = act8865_pdata_from_dt(dev, of_node, &pdata_of, matches,
num_regulators);
if (ret < 0) if (ret < 0)
return ret; return ret;
pdata = &pdata_of; pdata = &pdata_of;
} }
if (pdata->num_regulators > ACT8865_REG_NUM) { if (pdata->num_regulators > num_regulators) {
dev_err(dev, "Too many regulators found!\n"); dev_err(dev, "too many regulators: %d\n",
pdata->num_regulators);
return -EINVAL; return -EINVAL;
} }
...@@ -313,8 +265,10 @@ static int act8865_pmic_probe(struct i2c_client *client, ...@@ -313,8 +265,10 @@ static int act8865_pmic_probe(struct i2c_client *client,
} }
/* Finally register devices */ /* Finally register devices */
for (i = 0; i < ACT8865_REG_NUM; i++) { for (i = 0; i < num_regulators; i++) {
const struct regulator_desc *desc = &act8865_reg[i]; const struct regulator_desc *desc = &regulators[i];
struct regulator_config config = { };
struct regulator_dev *rdev;
config.dev = dev; config.dev = dev;
config.init_data = act8865_get_init_data(desc->id, pdata); config.init_data = act8865_get_init_data(desc->id, pdata);
...@@ -330,12 +284,13 @@ static int act8865_pmic_probe(struct i2c_client *client, ...@@ -330,12 +284,13 @@ static int act8865_pmic_probe(struct i2c_client *client,
} }
i2c_set_clientdata(client, act8865); i2c_set_clientdata(client, act8865);
devm_kfree(dev, of_node);
return 0; return 0;
} }
static const struct i2c_device_id act8865_ids[] = { static const struct i2c_device_id act8865_ids[] = {
{ "act8865", 0 }, { .name = "act8865", .driver_data = ACT8865 },
{ }, { },
}; };
MODULE_DEVICE_TABLE(i2c, act8865_ids); MODULE_DEVICE_TABLE(i2c, act8865_ids);
...@@ -351,6 +306,6 @@ static struct i2c_driver act8865_pmic_driver = { ...@@ -351,6 +306,6 @@ static struct i2c_driver act8865_pmic_driver = {
module_i2c_driver(act8865_pmic_driver); module_i2c_driver(act8865_pmic_driver);
MODULE_DESCRIPTION("active-semi act8865 voltage regulator driver"); MODULE_DESCRIPTION("active-semi act88xx voltage regulator driver");
MODULE_AUTHOR("Wenyou Yang <wenyou.yang@atmel.com>"); MODULE_AUTHOR("Wenyou Yang <wenyou.yang@atmel.com>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
include/linux/regulator/act8865.h
View file @ 50a03e35
/* /*
* act8865.h -- Voltage regulation for the active-semi act8865 * act8865.h -- Voltage regulation for active-semi act88xx PMUs
* *
* Copyright (C) 2013 Atmel Corporation. * Copyright (C) 2013 Atmel Corporation.
* *
...@@ -29,6 +29,10 @@ enum { ...@@ -29,6 +29,10 @@ enum {
ACT8865_REG_NUM, ACT8865_REG_NUM,
}; };
enum {
ACT8865,
};
/** /**
* act8865_regulator_data - regulator data * act8865_regulator_data - regulator data
* @id: regulator id * @id: regulator id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7