Commit 862f9f84 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branches 'regulator/topic/88pm800',...

Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ab8500', 'regulator/topic/act8865', 'regulator/topic/as3722' and 'regulator/topic/bcm590xx' into regulator-next
ACT8865 regulator ACT88xx regulators
------------------- -------------------
Required properties: Required properties:
- compatible: "active-semi,act8865" - compatible: "active-semi,act8846" or "active-semi,act8865"
- reg: I2C slave address - reg: I2C slave address
Any standard regulator properties can be used to configure the single regulator. Any standard regulator properties can be used to configure the single regulator.
The valid names for regulators are: The valid names for regulators are:
- for act8846:
REG1, REG2, REG3, REG4, REG5, REG6, REG7, REG8, REG9, REG10, REG11, REG12
- for act8865:
DCDC_REG1, DCDC_REG2, DCDC_REG3, LDO_REG1, LDO_REG2, LDO_REG3, LDO_REG4. DCDC_REG1, DCDC_REG2, DCDC_REG3, LDO_REG1, LDO_REG2, LDO_REG3, LDO_REG4.
Example: Example:
......
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
#define PM800_BUCK1_3 (0x3F) #define PM800_BUCK1_3 (0x3F)
#define PM800_BUCK2 (0x40) #define PM800_BUCK2 (0x40)
#define PM800_BUCK3 (0x41) #define PM800_BUCK3 (0x41)
#define PM800_BUCK3 (0x41)
#define PM800_BUCK4 (0x42) #define PM800_BUCK4 (0x42)
#define PM800_BUCK4_1 (0x43) #define PM800_BUCK4_1 (0x43)
#define PM800_BUCK4_2 (0x44) #define PM800_BUCK4_2 (0x44)
......
...@@ -3037,28 +3037,12 @@ static int ab8500_regulator_register(struct platform_device *pdev, ...@@ -3037,28 +3037,12 @@ static int ab8500_regulator_register(struct platform_device *pdev,
return 0; return 0;
} }
static int
ab8500_regulator_of_probe(struct platform_device *pdev,
struct device_node *np)
{
struct of_regulator_match *match = abx500_regulator.match;
int err, i;
for (i = 0; i < abx500_regulator.info_size; i++) {
err = ab8500_regulator_register(
pdev, match[i].init_data, i, match[i].of_node);
if (err)
return err;
}
return 0;
}
static int ab8500_regulator_probe(struct platform_device *pdev) static int ab8500_regulator_probe(struct platform_device *pdev)
{ {
struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent); struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent);
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
int err; struct of_regulator_match *match;
int err, i;
if (!ab8500) { if (!ab8500) {
dev_err(&pdev->dev, "null mfd parent\n"); dev_err(&pdev->dev, "null mfd parent\n");
...@@ -3075,24 +3059,20 @@ static int ab8500_regulator_probe(struct platform_device *pdev) ...@@ -3075,24 +3059,20 @@ static int ab8500_regulator_probe(struct platform_device *pdev)
"Error parsing regulator init data: %d\n", err); "Error parsing regulator init data: %d\n", err);
return err; return err;
} }
return ab8500_regulator_of_probe(pdev, np);
}
static int ab8500_regulator_remove(struct platform_device *pdev) match = abx500_regulator.match;
{ for (i = 0; i < abx500_regulator.info_size; i++) {
int err; err = ab8500_regulator_register(pdev, match[i].init_data, i,
match[i].of_node);
/* remove regulator debug */
err = ab8500_regulator_debug_exit(pdev);
if (err) if (err)
return err; return err;
}
return 0; return 0;
} }
static struct platform_driver ab8500_regulator_driver = { static struct platform_driver ab8500_regulator_driver = {
.probe = ab8500_regulator_probe, .probe = ab8500_regulator_probe,
.remove = ab8500_regulator_remove,
.driver = { .driver = {
.name = "ab8500-regulator", .name = "ab8500-regulator",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
/* /*
* 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
* *
...@@ -27,6 +28,40 @@ ...@@ -27,6 +28,40 @@
#include <linux/regulator/of_regulator.h> #include <linux/regulator/of_regulator.h>
#include <linux/regmap.h> #include <linux/regmap.h>
/*
* ACT8846 Global Register Map.
*/
#define ACT8846_SYS0 0x00
#define ACT8846_SYS1 0x01
#define ACT8846_REG1_VSET 0x10
#define ACT8846_REG1_CTRL 0x12
#define ACT8846_REG2_VSET0 0x20
#define ACT8846_REG2_VSET1 0x21
#define ACT8846_REG2_CTRL 0x22
#define ACT8846_REG3_VSET0 0x30
#define ACT8846_REG3_VSET1 0x31
#define ACT8846_REG3_CTRL 0x32
#define ACT8846_REG4_VSET0 0x40
#define ACT8846_REG4_VSET1 0x41
#define ACT8846_REG4_CTRL 0x42
#define ACT8846_REG5_VSET 0x50
#define ACT8846_REG5_CTRL 0x51
#define ACT8846_REG6_VSET 0x58
#define ACT8846_REG6_CTRL 0x59
#define ACT8846_REG7_VSET 0x60
#define ACT8846_REG7_CTRL 0x61
#define ACT8846_REG8_VSET 0x68
#define ACT8846_REG8_CTRL 0x69
#define ACT8846_REG9_VSET 0x70
#define ACT8846_REG9_CTRL 0x71
#define ACT8846_REG10_VSET 0x80
#define ACT8846_REG10_CTRL 0x81
#define ACT8846_REG11_VSET 0x90
#define ACT8846_REG11_CTRL 0x91
#define ACT8846_REG12_VSET 0xa0
#define ACT8846_REG12_CTRL 0xa1
#define ACT8846_REG13_CTRL 0xb1
/* /*
* ACT8865 Global Register Map. * ACT8865 Global Register Map.
*/ */
...@@ -70,7 +105,7 @@ static const struct regmap_config act8865_regmap_config = { ...@@ -70,7 +105,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,114 +121,70 @@ static struct regulator_ops act8865_ops = { ...@@ -86,114 +121,70 @@ 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 act8846_regulators[] = {
.id = ACT8865_ID_DCDC2, ACT88xx_REG("REG1", ACT8846, REG1, VSET),
.ops = &act8865_ops, ACT88xx_REG("REG2", ACT8846, REG2, VSET0),
.type = REGULATOR_VOLTAGE, ACT88xx_REG("REG3", ACT8846, REG3, VSET0),
.n_voltages = ACT8865_VOLTAGE_NUM, ACT88xx_REG("REG4", ACT8846, REG4, VSET0),
.linear_ranges = act8865_volatge_ranges, ACT88xx_REG("REG5", ACT8846, REG5, VSET),
.n_linear_ranges = ARRAY_SIZE(act8865_volatge_ranges), ACT88xx_REG("REG6", ACT8846, REG6, VSET),
.vsel_reg = ACT8865_DCDC2_VSET1, ACT88xx_REG("REG7", ACT8846, REG7, VSET),
.vsel_mask = ACT8865_VSEL_MASK, ACT88xx_REG("REG8", ACT8846, REG8, VSET),
.enable_reg = ACT8865_DCDC2_CTRL, ACT88xx_REG("REG9", ACT8846, REG9, VSET),
.enable_mask = ACT8865_ENA, ACT88xx_REG("REG10", ACT8846, REG10, VSET),
.owner = THIS_MODULE, ACT88xx_REG("REG11", ACT8846, REG11, VSET),
}, ACT88xx_REG("REG12", ACT8846, REG12, VSET),
{ };
.name = "DCDC_REG3",
.id = ACT8865_ID_DCDC3, static const struct regulator_desc act8865_regulators[] = {
.ops = &act8865_ops, ACT88xx_REG("DCDC_REG1", ACT8865, DCDC1, VSET1),
.type = REGULATOR_VOLTAGE, ACT88xx_REG("DCDC_REG2", ACT8865, DCDC2, VSET1),
.n_voltages = ACT8865_VOLTAGE_NUM, ACT88xx_REG("DCDC_REG3", ACT8865, DCDC3, VSET1),
.linear_ranges = act8865_volatge_ranges, ACT88xx_REG("LDO_REG1", ACT8865, LDO1, VSET),
.n_linear_ranges = ARRAY_SIZE(act8865_volatge_ranges), ACT88xx_REG("LDO_REG2", ACT8865, LDO2, VSET),
.vsel_reg = ACT8865_DCDC3_VSET1, ACT88xx_REG("LDO_REG3", ACT8865, LDO3, VSET),
.vsel_mask = ACT8865_VSEL_MASK, ACT88xx_REG("LDO_REG4", ACT8865, LDO4, VSET),
.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,act8846", .data = (void *)ACT8846 },
{ .compatible = "active-semi,act8865", .data = (void *)ACT8865 },
{ } { }
}; };
MODULE_DEVICE_TABLE(of, act8865_dt_ids); MODULE_DEVICE_TABLE(of, act8865_dt_ids);
static struct of_regulator_match act8846_matches[] = {
[ACT8846_ID_REG1] = { .name = "REG1" },
[ACT8846_ID_REG2] = { .name = "REG2" },
[ACT8846_ID_REG3] = { .name = "REG3" },
[ACT8846_ID_REG4] = { .name = "REG4" },
[ACT8846_ID_REG5] = { .name = "REG5" },
[ACT8846_ID_REG6] = { .name = "REG6" },
[ACT8846_ID_REG7] = { .name = "REG7" },
[ACT8846_ID_REG8] = { .name = "REG8" },
[ACT8846_ID_REG9] = { .name = "REG9" },
[ACT8846_ID_REG10] = { .name = "REG10" },
[ACT8846_ID_REG11] = { .name = "REG11" },
[ACT8846_ID_REG12] = { .name = "REG12" },
};
static struct of_regulator_match act8865_matches[] = { static struct of_regulator_match act8865_matches[] = {
[ACT8865_ID_DCDC1] = { .name = "DCDC_REG1"}, [ACT8865_ID_DCDC1] = { .name = "DCDC_REG1"},
[ACT8865_ID_DCDC2] = { .name = "DCDC_REG2"}, [ACT8865_ID_DCDC2] = { .name = "DCDC_REG2"},
...@@ -206,11 +197,13 @@ static struct of_regulator_match act8865_matches[] = { ...@@ -206,11 +197,13 @@ 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,
unsigned long type)
{ {
int matched, i; int matched, i, num_matches;
struct device_node *np; struct device_node *np;
struct act8865_regulator_data *regulator; struct act8865_regulator_data *regulator;
struct of_regulator_match *matches;
np = of_get_child_by_name(dev->of_node, "regulators"); np = of_get_child_by_name(dev->of_node, "regulators");
if (!np) { if (!np) {
...@@ -218,26 +211,39 @@ static int act8865_pdata_from_dt(struct device *dev, ...@@ -218,26 +211,39 @@ static int act8865_pdata_from_dt(struct device *dev,
return -EINVAL; return -EINVAL;
} }
matched = of_regulator_match(dev, np, switch (type) {
act8865_matches, ARRAY_SIZE(act8865_matches)); case ACT8846:
matches = act8846_matches;
num_matches = ARRAY_SIZE(act8846_matches);
break;
case ACT8865:
matches = act8865_matches;
num_matches = ARRAY_SIZE(act8865_matches);
break;
default:
dev_err(dev, "invalid device id %lu\n", type);
return -EINVAL;
}
matched = of_regulator_match(dev, np, matches, num_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++;
} }
...@@ -246,42 +252,84 @@ static int act8865_pdata_from_dt(struct device *dev, ...@@ -246,42 +252,84 @@ static int act8865_pdata_from_dt(struct device *dev,
#else #else
static inline int act8865_pdata_from_dt(struct device *dev, static inline 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,
unsigned long type)
{ {
return 0; return 0;
} }
#endif #endif
static struct regulator_init_data
*act8865_get_init_data(int id, struct act8865_platform_data *pdata)
{
int i;
if (!pdata)
return NULL;
for (i = 0; i < pdata->num_regulators; i++) {
if (pdata->regulators[i].id == id)
return pdata->regulators[i].platform_data;
}
return NULL;
}
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 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, id;
int ret = -EINVAL; pdata = dev_get_platdata(dev);
int error;
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 ACT8846:
regulators = act8846_regulators;
num_regulators = ARRAY_SIZE(act8846_regulators);
break;
case ACT8865:
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, type);
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;
} }
...@@ -291,39 +339,40 @@ static int act8865_pmic_probe(struct i2c_client *client, ...@@ -291,39 +339,40 @@ static int act8865_pmic_probe(struct i2c_client *client,
act8865->regmap = devm_regmap_init_i2c(client, &act8865_regmap_config); act8865->regmap = devm_regmap_init_i2c(client, &act8865_regmap_config);
if (IS_ERR(act8865->regmap)) { if (IS_ERR(act8865->regmap)) {
error = PTR_ERR(act8865->regmap); ret = PTR_ERR(act8865->regmap);
dev_err(&client->dev, "Failed to allocate register map: %d\n", dev_err(&client->dev, "Failed to allocate register map: %d\n",
error); ret);
return error; return ret;
} }
/* 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 = &regulators[i];
id = pdata->regulators[i].id; struct regulator_config config = { };
struct regulator_dev *rdev;
config.dev = dev; config.dev = dev;
config.init_data = pdata->regulators[i].platform_data; config.init_data = act8865_get_init_data(desc->id, pdata);
config.of_node = of_node[i]; config.of_node = of_node[i];
config.driver_data = act8865; config.driver_data = act8865;
config.regmap = act8865->regmap; config.regmap = act8865->regmap;
rdev = devm_regulator_register(&client->dev, &act8865_reg[i], rdev = devm_regulator_register(&client->dev, desc, &config);
&config);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
dev_err(dev, "failed to register %s\n", dev_err(dev, "failed to register %s\n", desc->name);
act8865_reg[id].name);
return PTR_ERR(rdev); return PTR_ERR(rdev);
} }
} }
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 = "act8846", .driver_data = ACT8846 },
{ .name = "act8865", .driver_data = ACT8865 },
{ }, { },
}; };
MODULE_DEVICE_TABLE(i2c, act8865_ids); MODULE_DEVICE_TABLE(i2c, act8865_ids);
...@@ -339,6 +388,6 @@ static struct i2c_driver act8865_pmic_driver = { ...@@ -339,6 +388,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");
...@@ -219,7 +219,7 @@ static const struct as3722_register_mapping as3722_reg_lookup[] = { ...@@ -219,7 +219,7 @@ static const struct as3722_register_mapping as3722_reg_lookup[] = {
{ {
.regulator_id = AS3722_REGULATOR_ID_LDO3, .regulator_id = AS3722_REGULATOR_ID_LDO3,
.name = "as3722-ldo3", .name = "as3722-ldo3",
.name = "vin-ldo3-4", .sname = "vin-ldo3-4",
.vsel_reg = AS3722_LDO3_VOLTAGE_REG, .vsel_reg = AS3722_LDO3_VOLTAGE_REG,
.vsel_mask = AS3722_LDO3_VSEL_MASK, .vsel_mask = AS3722_LDO3_VSEL_MASK,
.enable_reg = AS3722_LDOCONTROL0_REG, .enable_reg = AS3722_LDOCONTROL0_REG,
...@@ -231,7 +231,7 @@ static const struct as3722_register_mapping as3722_reg_lookup[] = { ...@@ -231,7 +231,7 @@ static const struct as3722_register_mapping as3722_reg_lookup[] = {
{ {
.regulator_id = AS3722_REGULATOR_ID_LDO4, .regulator_id = AS3722_REGULATOR_ID_LDO4,
.name = "as3722-ldo4", .name = "as3722-ldo4",
.name = "vin-ldo3-4", .sname = "vin-ldo3-4",
.vsel_reg = AS3722_LDO4_VOLTAGE_REG, .vsel_reg = AS3722_LDO4_VOLTAGE_REG,
.vsel_mask = AS3722_LDO_VSEL_MASK, .vsel_mask = AS3722_LDO_VSEL_MASK,
.enable_reg = AS3722_LDOCONTROL0_REG, .enable_reg = AS3722_LDOCONTROL0_REG,
......
...@@ -331,10 +331,8 @@ static struct bcm590xx_board *bcm590xx_parse_dt_reg_data( ...@@ -331,10 +331,8 @@ static struct bcm590xx_board *bcm590xx_parse_dt_reg_data(
} }
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
if (!data) { if (!data)
dev_err(&pdev->dev, "failed to allocate regulator board data\n");
return NULL; return NULL;
}
np = of_node_get(np); np = of_node_get(np);
regulators = of_get_child_by_name(np, "regulators"); regulators = of_get_child_by_name(np, "regulators");
...@@ -379,10 +377,8 @@ static int bcm590xx_probe(struct platform_device *pdev) ...@@ -379,10 +377,8 @@ static int bcm590xx_probe(struct platform_device *pdev)
&bcm590xx_reg_matches); &bcm590xx_reg_matches);
pmu = devm_kzalloc(&pdev->dev, sizeof(*pmu), GFP_KERNEL); pmu = devm_kzalloc(&pdev->dev, sizeof(*pmu), GFP_KERNEL);
if (!pmu) { if (!pmu)
dev_err(&pdev->dev, "Memory allocation failed for pmu\n");
return -ENOMEM; return -ENOMEM;
}
pmu->mfd = bcm590xx; pmu->mfd = bcm590xx;
...@@ -390,17 +386,13 @@ static int bcm590xx_probe(struct platform_device *pdev) ...@@ -390,17 +386,13 @@ static int bcm590xx_probe(struct platform_device *pdev)
pmu->desc = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS * pmu->desc = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS *
sizeof(struct regulator_desc), GFP_KERNEL); sizeof(struct regulator_desc), GFP_KERNEL);
if (!pmu->desc) { if (!pmu->desc)
dev_err(&pdev->dev, "Memory alloc fails for desc\n");
return -ENOMEM; return -ENOMEM;
}
pmu->info = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS * pmu->info = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS *
sizeof(struct bcm590xx_info *), GFP_KERNEL); sizeof(struct bcm590xx_info *), GFP_KERNEL);
if (!pmu->info) { if (!pmu->info)
dev_err(&pdev->dev, "Memory alloc fails for info\n");
return -ENOMEM; return -ENOMEM;
}
info = bcm590xx_regs; info = bcm590xx_regs;
......
...@@ -322,18 +322,4 @@ struct ab8500_regulator_platform_data { ...@@ -322,18 +322,4 @@ struct ab8500_regulator_platform_data {
struct regulator_init_data *ext_regulator; struct regulator_init_data *ext_regulator;
}; };
#ifdef CONFIG_REGULATOR_AB8500_DEBUG
int ab8500_regulator_debug_init(struct platform_device *pdev);
int ab8500_regulator_debug_exit(struct platform_device *pdev);
#else
static inline int ab8500_regulator_debug_init(struct platform_device *pdev)
{
return 0;
}
static inline int ab8500_regulator_debug_exit(struct platform_device *pdev)
{
return 0;
}
#endif
#endif #endif
/* /*
* 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,27 @@ enum { ...@@ -29,6 +29,27 @@ enum {
ACT8865_REG_NUM, ACT8865_REG_NUM,
}; };
enum {
ACT8846_ID_REG1,
ACT8846_ID_REG2,
ACT8846_ID_REG3,
ACT8846_ID_REG4,
ACT8846_ID_REG5,
ACT8846_ID_REG6,
ACT8846_ID_REG7,
ACT8846_ID_REG8,
ACT8846_ID_REG9,
ACT8846_ID_REG10,
ACT8846_ID_REG11,
ACT8846_ID_REG12,
ACT8846_REG_NUM,
};
enum {
ACT8865,
ACT8846,
};
/** /**
* 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