regulator: palmas: Add DT support
Add DT support to palmas regulator. This involved a little change to the platform data structure. Regulator information can now come from platform data or DT. Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Graeme Gregory
Samuel Ortiz
Родитель
7cc4c92fbc
Коммит
a361cd9f2e
|
|
@ -22,6 +22,9 @@
|
|||
#include <linux/slab.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/mfd/palmas.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <linux/regulator/of_regulator.h>
|
||||
|
||||
struct regs_info {
|
||||
char *name;
|
||||
|
|
@ -603,10 +606,103 @@ static int palmas_ldo_init(struct palmas *palmas, int id,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct of_regulator_match palmas_matches[] = {
|
||||
{ .name = "smps12", },
|
||||
{ .name = "smps123", },
|
||||
{ .name = "smps3", },
|
||||
{ .name = "smps45", },
|
||||
{ .name = "smps457", },
|
||||
{ .name = "smps6", },
|
||||
{ .name = "smps7", },
|
||||
{ .name = "smps8", },
|
||||
{ .name = "smps9", },
|
||||
{ .name = "smps10", },
|
||||
{ .name = "ldo1", },
|
||||
{ .name = "ldo2", },
|
||||
{ .name = "ldo3", },
|
||||
{ .name = "ldo4", },
|
||||
{ .name = "ldo5", },
|
||||
{ .name = "ldo6", },
|
||||
{ .name = "ldo7", },
|
||||
{ .name = "ldo8", },
|
||||
{ .name = "ldo9", },
|
||||
{ .name = "ldoln", },
|
||||
{ .name = "ldousb", },
|
||||
};
|
||||
|
||||
static void __devinit palmas_dt_to_pdata(struct device *dev,
|
||||
struct device_node *node,
|
||||
struct palmas_pmic_platform_data *pdata)
|
||||
{
|
||||
struct device_node *regulators;
|
||||
u32 prop;
|
||||
int idx, ret;
|
||||
|
||||
regulators = of_find_node_by_name(node, "regulators");
|
||||
if (!regulators) {
|
||||
dev_info(dev, "regulator node not found\n");
|
||||
return;
|
||||
}
|
||||
|
||||
ret = of_regulator_match(dev, regulators, palmas_matches,
|
||||
PALMAS_NUM_REGS);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "Error parsing regulator init data: %d\n", ret);
|
||||
return;
|
||||
}
|
||||
|
||||
for (idx = 0; idx < PALMAS_NUM_REGS; idx++) {
|
||||
if (!palmas_matches[idx].init_data ||
|
||||
!palmas_matches[idx].of_node)
|
||||
continue;
|
||||
|
||||
pdata->reg_data[idx] = palmas_matches[idx].init_data;
|
||||
|
||||
pdata->reg_init[idx] = devm_kzalloc(dev,
|
||||
sizeof(struct palmas_reg_init), GFP_KERNEL);
|
||||
|
||||
ret = of_property_read_u32(palmas_matches[idx].of_node,
|
||||
"ti,warm_reset", &prop);
|
||||
if (!ret)
|
||||
pdata->reg_init[idx]->warm_reset = prop;
|
||||
|
||||
ret = of_property_read_u32(palmas_matches[idx].of_node,
|
||||
"ti,roof_floor", &prop);
|
||||
if (!ret)
|
||||
pdata->reg_init[idx]->roof_floor = prop;
|
||||
|
||||
ret = of_property_read_u32(palmas_matches[idx].of_node,
|
||||
"ti,mode_sleep", &prop);
|
||||
if (!ret)
|
||||
pdata->reg_init[idx]->mode_sleep = prop;
|
||||
|
||||
ret = of_property_read_u32(palmas_matches[idx].of_node,
|
||||
"ti,warm_reset", &prop);
|
||||
if (!ret)
|
||||
pdata->reg_init[idx]->warm_reset = prop;
|
||||
|
||||
ret = of_property_read_u32(palmas_matches[idx].of_node,
|
||||
"ti,tstep", &prop);
|
||||
if (!ret)
|
||||
pdata->reg_init[idx]->tstep = prop;
|
||||
|
||||
ret = of_property_read_u32(palmas_matches[idx].of_node,
|
||||
"ti,vsel", &prop);
|
||||
if (!ret)
|
||||
pdata->reg_init[idx]->vsel = prop;
|
||||
}
|
||||
|
||||
ret = of_property_read_u32(node, "ti,ldo6_vibrator", &prop);
|
||||
if (!ret)
|
||||
pdata->ldo6_vibrator = prop;
|
||||
}
|
||||
|
||||
|
||||
static __devinit int palmas_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
|
||||
struct palmas_pmic_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct device_node *node = pdev->dev.of_node;
|
||||
struct regulator_dev *rdev;
|
||||
struct regulator_config config = { };
|
||||
struct palmas_pmic *pmic;
|
||||
|
|
@ -614,10 +710,14 @@ static __devinit int palmas_probe(struct platform_device *pdev)
|
|||
int id = 0, ret;
|
||||
unsigned int addr, reg;
|
||||
|
||||
if (!pdata)
|
||||
return -EINVAL;
|
||||
if (!pdata->reg_data)
|
||||
return -EINVAL;
|
||||
if (node && !pdata) {
|
||||
pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
|
||||
|
||||
if (!pdata)
|
||||
return -ENOMEM;
|
||||
|
||||
palmas_dt_to_pdata(&pdev->dev, node, pdata);
|
||||
}
|
||||
|
||||
pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);
|
||||
if (!pmic)
|
||||
|
|
@ -694,7 +794,7 @@ static __devinit int palmas_probe(struct platform_device *pdev)
|
|||
pmic->desc[id].owner = THIS_MODULE;
|
||||
|
||||
/* Initialise sleep/init values from platform data */
|
||||
if (pdata && pdata->reg_init) {
|
||||
if (pdata) {
|
||||
reg_init = pdata->reg_init[id];
|
||||
if (reg_init) {
|
||||
ret = palmas_smps_init(palmas, id, reg_init);
|
||||
|
|
@ -718,11 +818,13 @@ static __devinit int palmas_probe(struct platform_device *pdev)
|
|||
pmic->range[id] = 1;
|
||||
}
|
||||
|
||||
if (pdata && pdata->reg_data)
|
||||
if (pdata)
|
||||
config.init_data = pdata->reg_data[id];
|
||||
else
|
||||
config.init_data = NULL;
|
||||
|
||||
config.of_node = palmas_matches[id].of_node;
|
||||
|
||||
rdev = regulator_register(&pmic->desc[id], &config);
|
||||
if (IS_ERR(rdev)) {
|
||||
dev_err(&pdev->dev,
|
||||
|
|
@ -756,11 +858,13 @@ static __devinit int palmas_probe(struct platform_device *pdev)
|
|||
palmas_regs_info[id].ctrl_addr);
|
||||
pmic->desc[id].enable_mask = PALMAS_LDO1_CTRL_MODE_ACTIVE;
|
||||
|
||||
if (pdata && pdata->reg_data)
|
||||
if (pdata)
|
||||
config.init_data = pdata->reg_data[id];
|
||||
else
|
||||
config.init_data = NULL;
|
||||
|
||||
config.of_node = palmas_matches[id].of_node;
|
||||
|
||||
rdev = regulator_register(&pmic->desc[id], &config);
|
||||
if (IS_ERR(rdev)) {
|
||||
dev_err(&pdev->dev,
|
||||
|
|
@ -774,7 +878,7 @@ static __devinit int palmas_probe(struct platform_device *pdev)
|
|||
pmic->rdev[id] = rdev;
|
||||
|
||||
/* Initialise sleep/init values from platform data */
|
||||
if (pdata->reg_init) {
|
||||
if (pdata) {
|
||||
reg_init = pdata->reg_init[id];
|
||||
if (reg_init) {
|
||||
ret = palmas_ldo_init(palmas, id, reg_init);
|
||||
|
|
@ -802,9 +906,15 @@ static int __devexit palmas_remove(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct of_device_id __devinitdata of_palmas_match_tbl[] = {
|
||||
{ .compatible = "ti,palmas-pmic", },
|
||||
{ /* end */ }
|
||||
};
|
||||
|
||||
static struct platform_driver palmas_driver = {
|
||||
.driver = {
|
||||
.name = "palmas-pmic",
|
||||
.of_match_table = of_palmas_match_tbl,
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = palmas_probe,
|
||||
|
|
@ -827,3 +937,4 @@ MODULE_AUTHOR("Graeme Gregory <gg@slimlogic.co.uk>");
|
|||
MODULE_DESCRIPTION("Palmas voltage regulator driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS("platform:palmas-pmic");
|
||||
MODULE_DEVICE_TABLE(of, of_palmas_match_tbl);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче