microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

staging: hikey9xx: hi6421v600-regulator: move LDO config from DT 

Instead of storing regulator LDO configuration inside the DT, move
it to be part of the driver itself.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/46b16fdf4ad924b5d9a06139cd7ff2dae28d5a6c.1611212783.git.mchehab+huawei@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mauro Carvalho Chehab 2021-01-21 08:18:07 +01:00 коммит произвёл Greg Kroah-Hartman
Родитель fac4da4ff0
Коммит d2dfd50a0b
1 изменённых файлов: 152 добавлений и 227 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

379
drivers/staging/hikey9xx/hi6421v600-regulator.c
Просмотреть файл

@ -16,35 +16,97 @@
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
#include <linux/delay.h>
#include <linux/mfd/hi6421-spmi-pmic.h> #include <linux/mfd/hi6421-spmi-pmic.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regmap.h>
#include <linux/regulator/driver.h> #include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
#include <linux/regulator/of_regulator.h>
#include <linux/spmi.h> #include <linux/spmi.h>
#define rdev_dbg(rdev, fmt, arg...) \ #define rdev_dbg(rdev, fmt, arg...) \
pr_debug("%s: %s: " fmt, (rdev)->desc->name, __func__, ##arg) pr_debug("%s: %s: " fmt, (rdev)->desc->name, __func__, ##arg)
struct hi6421v600_regulator { struct hi6421_spmi_reg_info {
struct regulator_desc rdesc; struct regulator_desc desc;
struct hi6421_spmi_pmic *pmic; struct hi6421_spmi_pmic *pmic;
u32 eco_mode_mask, eco_uA; u8 eco_mode_mask;
u32 eco_uA;
}; };
static DEFINE_MUTEX(enable_mutex); static DEFINE_MUTEX(enable_mutex);
static const unsigned int ldo3_voltages[] = {
1500000, 1550000, 1600000, 1650000,
1700000, 1725000, 1750000, 1775000,
1800000, 1825000, 1850000, 1875000,
1900000, 1925000, 1950000, 2000000
};
static const unsigned int ldo4_voltages[] = {
1725000, 1750000, 1775000, 1800000,
1825000, 1850000, 1875000, 1900000
};
static const unsigned int ldo9_voltages[] = {
1750000, 1800000, 1825000, 2800000,
2850000, 2950000, 3000000, 3300000
};
static const unsigned int ldo15_voltages[] = {
1800000, 1850000, 2400000, 2600000,
2700000, 2850000, 2950000, 3000000
};
static const unsigned int ldo17_voltages[] = {
2500000, 2600000, 2700000, 2800000,
3000000, 3100000, 3200000, 3300000
};
static const unsigned int ldo34_voltages[] = {
2600000, 2700000, 2800000, 2900000,
3000000, 3100000, 3200000, 3300000
};
/* /*
* helper function to ensure when it returns it is at least 'delay_us' * _id - LDO id name string
* microseconds after 'since'. * _match - of match name string
* v_table - voltage table
* vreg - voltage select register
* vmask - voltage select mask
* ereg - enable register
* emask - enable mask
* odelay - off/on delay time in uS
* ecomask - eco mode mask
* ecoamp - eco mode load uppler limit in uA
*/ */
#define HI6421V600_LDO(_id, vtable, ereg, emask, vreg, \
odelay, etime, ecomask, ecoamp) \
[HI6421V600_##_id] = { \
.desc = { \
.name = #_id, \
.of_match = of_match_ptr(#_id), \
.regulators_node = of_match_ptr("regulators"), \
.ops = &hi6421_spmi_ldo_rops, \
.type = REGULATOR_VOLTAGE, \
.id = HI6421V600_##_id, \
.owner = THIS_MODULE, \
.volt_table = vtable, \
.n_voltages = ARRAY_SIZE(vtable), \
.vsel_mask = (1 << (ARRAY_SIZE(vtable) - 1)) - 1, \
.vsel_reg = vreg, \
.enable_reg = ereg, \
.enable_mask = emask, \
.enable_time = etime, \
.ramp_delay = etime, \
.off_on_delay = odelay, \
}, \
.eco_mode_mask = ecomask, \
.eco_uA = ecoamp, \
}
static int hi6421_spmi_regulator_is_enabled(struct regulator_dev *rdev) static int hi6421_spmi_regulator_is_enabled(struct regulator_dev *rdev)
{ {
struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
struct hi6421_spmi_pmic *pmic = sreg->pmic; struct hi6421_spmi_pmic *pmic = sreg->pmic;
u32 reg_val; u32 reg_val;
@ -60,7 +122,7 @@ static int hi6421_spmi_regulator_is_enabled(struct regulator_dev *rdev)
static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev)
{ {
struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
struct hi6421_spmi_pmic *pmic = sreg->pmic; struct hi6421_spmi_pmic *pmic = sreg->pmic;
/* cannot enable more than one regulator at one time */ /* cannot enable more than one regulator at one time */
@ -85,7 +147,7 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev)
static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev) static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev)
{ {
struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
struct hi6421_spmi_pmic *pmic = sreg->pmic; struct hi6421_spmi_pmic *pmic = sreg->pmic;
/* set enable register to 0 */ /* set enable register to 0 */
@ -100,7 +162,7 @@ static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev)
static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev) static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev)
{ {
struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
struct hi6421_spmi_pmic *pmic = sreg->pmic; struct hi6421_spmi_pmic *pmic = sreg->pmic;
u32 reg_val, selector; u32 reg_val, selector;
@ -120,7 +182,7 @@ static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev)
static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev,
unsigned int selector) unsigned int selector)
{ {
struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
struct hi6421_spmi_pmic *pmic = sreg->pmic; struct hi6421_spmi_pmic *pmic = sreg->pmic;
u32 reg_val; u32 reg_val;
@ -143,7 +205,7 @@ static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev,
static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)
{ {
struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
struct hi6421_spmi_pmic *pmic = sreg->pmic; struct hi6421_spmi_pmic *pmic = sreg->pmic;
unsigned int mode; unsigned int mode;
u32 reg_val; u32 reg_val;
@ -166,7 +228,7 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)
static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev,
unsigned int mode) unsigned int mode)
{ {
struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
struct hi6421_spmi_pmic *pmic = sreg->pmic; struct hi6421_spmi_pmic *pmic = sreg->pmic;
u32 val; u32 val;
@ -196,7 +258,7 @@ hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev,
int input_uV, int output_uV, int input_uV, int output_uV,
int load_uA) int load_uA)
{ {
struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev); struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);
if (load_uA || ((unsigned int)load_uA > sreg->eco_uA)) if (load_uA || ((unsigned int)load_uA > sreg->eco_uA))
return REGULATOR_MODE_NORMAL; return REGULATOR_MODE_NORMAL;
@ -204,99 +266,6 @@ hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev,
return REGULATOR_MODE_IDLE; return REGULATOR_MODE_IDLE;
} }
static int hi6421_spmi_dt_parse(struct platform_device *pdev,
struct hi6421v600_regulator *sreg,
struct regulator_desc *rdesc)
{
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
unsigned int *v_table;
int ret;
ret = of_property_read_u32(np, "reg", &rdesc->enable_reg);
if (ret) {
dev_err(dev, "missing reg property\n");
return ret;
}
ret = of_property_read_u32(np, "vsel-reg", &rdesc->vsel_reg);
if (ret) {
dev_err(dev, "missing vsel-reg property\n");
return ret;
}
ret = of_property_read_u32(np, "enable-mask", &rdesc->enable_mask);
if (ret) {
dev_err(dev, "missing enable-mask property\n");
return ret;
}
/*
* Not all regulators work on idle mode
*/
ret = of_property_read_u32(np, "idle-mode-mask", &sreg->eco_mode_mask);
if (ret) {
dev_dbg(dev, "LDO doesn't support economy mode.\n");
sreg->eco_mode_mask = 0;
sreg->eco_uA = 0;
} else {
ret = of_property_read_u32(np, "eco-microamp", &sreg->eco_uA);
if (ret) {
dev_err(dev, "missing eco-microamp property\n");
return ret;
}
}
/* parse .off-on-delay */
ret = of_property_read_u32(np, "off-on-delay-us",
&rdesc->off_on_delay);
if (ret) {
dev_err(dev, "missing off-on-delay-us property\n");
return ret;
}
/* parse .enable_time */
ret = of_property_read_u32(np, "startup-delay-us",
&rdesc->enable_time);
if (ret) {
dev_err(dev, "missing startup-delay-us property\n");
return ret;
}
/* FIXME: are there a better value for this? */
rdesc->ramp_delay = rdesc->enable_time;
/* parse volt_table */
rdesc->n_voltages = of_property_count_u32_elems(np, "voltage-table");
v_table = devm_kzalloc(dev, sizeof(unsigned int) * rdesc->n_voltages,
GFP_KERNEL);
if (unlikely(!v_table))
return -ENOMEM;
rdesc->volt_table = v_table;
ret = of_property_read_u32_array(np, "voltage-table",
v_table, rdesc->n_voltages);
if (ret) {
dev_err(dev, "missing voltage-table property\n");
return ret;
}
/*
* Instead of explicitly requiring a mask for the voltage selector,
* as they all start from bit zero (at least on the known LDOs),
* just use the number of voltages at the voltage table, getting the
* minimal mask that would pick everything.
*/
rdesc->vsel_mask = (1 << (fls(rdesc->n_voltages) - 1)) - 1;
dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x\n",
rdesc->vsel_reg, rdesc->vsel_mask);
return 0;
}
static const struct regulator_ops hi6421_spmi_ldo_rops = { static const struct regulator_ops hi6421_spmi_ldo_rops = {
.is_enabled = hi6421_spmi_regulator_is_enabled, .is_enabled = hi6421_spmi_regulator_is_enabled,
.enable = hi6421_spmi_regulator_enable, .enable = hi6421_spmi_regulator_enable,
@ -310,85 +279,63 @@ static const struct regulator_ops hi6421_spmi_ldo_rops = {
.get_optimum_mode = hi6421_spmi_regulator_get_optimum_mode, .get_optimum_mode = hi6421_spmi_regulator_get_optimum_mode,
}; };
static int hi6421_spmi_regulator_probe_ldo(struct platform_device *pdev, /* HI6421v600 regulators with known registers */
struct device_node *np, enum hi6421_spmi_regulator_id {
struct hi6421_spmi_pmic *pmic) HI6421V600_LDO3,
{ HI6421V600_LDO4,
struct regulation_constraints *constraint; HI6421V600_LDO9,
struct regulator_init_data *initdata; HI6421V600_LDO15,
struct regulator_config config = { }; HI6421V600_LDO16,
struct hi6421v600_regulator *sreg; HI6421V600_LDO17,
struct device *dev = &pdev->dev; HI6421V600_LDO33,
struct regulator_desc *rdesc; HI6421V600_LDO34,
struct regulator_dev *rdev; };
const char *supplyname;
int ret;
initdata = of_get_regulator_init_data(dev, np, NULL); static struct hi6421_spmi_reg_info regulator_info[] = {
if (!initdata) { HI6421V600_LDO(LDO3, ldo3_voltages,
dev_err(dev, "failed to get regulator data\n"); 0x16, 0x01, 0x51,
return -EINVAL; 20000, 120,
} 0, 0),
HI6421V600_LDO(LDO4, ldo4_voltages,
sreg = devm_kzalloc(dev, sizeof(*sreg), GFP_KERNEL); 0x17, 0x01, 0x52,
if (!sreg) 20000, 120,
return -ENOMEM; 0x10, 10000),
HI6421V600_LDO(LDO9, ldo9_voltages,
sreg->pmic = pmic; 0x1c, 0x01, 0x57,
rdesc = &sreg->rdesc; 20000, 360,
0x10, 10000),
rdesc->name = initdata->constraints.name; HI6421V600_LDO(LDO15, ldo15_voltages,
rdesc->ops = &hi6421_spmi_ldo_rops; 0x21, 0x01, 0x5c,
rdesc->type = REGULATOR_VOLTAGE; 20000, 360,
rdesc->min_uV = initdata->constraints.min_uV; 0x10, 10000),
HI6421V600_LDO(LDO16, ldo15_voltages,
supplyname = of_get_property(np, "supply_name", NULL); 0x22, 0x01, 0x5d,
if (supplyname) 20000, 360,
initdata->supply_regulator = supplyname; 0x10, 10000),
HI6421V600_LDO(LDO17, ldo17_voltages,
/* parse device tree data for regulator specific */ 0x23, 0x01, 0x5e,
ret = hi6421_spmi_dt_parse(pdev, sreg, rdesc); 20000, 120,
if (ret) 0x10, 10000),
return ret; HI6421V600_LDO(LDO33, ldo17_voltages,
0x32, 0x01, 0x6d,
/* hisi regulator supports two modes */ 20000, 120,
constraint = &initdata->constraints; 0, 0),
HI6421V600_LDO(LDO34, ldo34_voltages,
constraint->valid_modes_mask = REGULATOR_MODE_NORMAL; 0x33, 0x01, 0x6e,
if (sreg->eco_mode_mask) { 20000, 120,
constraint->valid_modes_mask |= REGULATOR_MODE_IDLE; 0, 0),
constraint->valid_ops_mask |= REGULATOR_CHANGE_MODE; };
}
config.dev = &pdev->dev;
config.init_data = initdata;
config.driver_data = sreg;
config.of_node = pdev->dev.of_node;
/* register regulator */
rdev = regulator_register(rdesc, &config);
if (IS_ERR(rdev)) {
dev_err(dev, "failed to register %s\n",
rdesc->name);
return PTR_ERR(rdev);
}
rdev_dbg(rdev, "valid_modes_mask: 0x%x, valid_ops_mask: 0x%x\n",
constraint->valid_modes_mask, constraint->valid_ops_mask);
dev_set_drvdata(dev, rdev);
return 0;
}
static int hi6421_spmi_regulator_probe(struct platform_device *pdev) static int hi6421_spmi_regulator_probe(struct platform_device *pdev)
{ {
struct device *pmic_dev = pdev->dev.parent; struct device *pmic_dev = pdev->dev.parent;
struct device_node *np = pmic_dev->of_node; struct regulator_config config = { };
struct device_node *regulators, *child; struct hi6421_spmi_reg_info *sreg;
struct platform_device *new_pdev; struct hi6421_spmi_reg_info *info;
struct device *dev = &pdev->dev;
struct hi6421_spmi_pmic *pmic; struct hi6421_spmi_pmic *pmic;
int ret; struct regulator_dev *rdev;
int i;
/* /*
* This driver is meant to be called by hi6421-spmi-core, * This driver is meant to be called by hi6421-spmi-core,
@ -399,68 +346,46 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev)
if (WARN_ON(!pmic)) if (WARN_ON(!pmic))
return -ENODEV; return -ENODEV;
regulators = of_get_child_by_name(np, "regulators"); sreg = devm_kzalloc(dev, sizeof(*sreg), GFP_KERNEL);
if (!regulators) { if (!sreg)
dev_err(&pdev->dev, "regulator node not found\n"); return -ENOMEM;
return -ENODEV;
}
/* sreg->pmic = pmic;
* Parse all LDO regulator nodes
*/
for_each_child_of_node(regulators, child) {
dev_dbg(&pdev->dev, "adding child %pOF\n", child);
new_pdev = platform_device_alloc(child->name, -1); for (i = 0; i < ARRAY_SIZE(regulator_info); i++) {
new_pdev->dev.parent = pmic_dev; /* assign per-regulator data */
new_pdev->dev.of_node = of_node_get(child); info = &regulator_info[i];
ret = platform_device_add(new_pdev); dev_dbg(dev, "adding regulator %s\n", info->desc.name);
if (ret < 0) {
platform_device_put(new_pdev); config.dev = pdev->dev.parent;
continue; config.driver_data = sreg;
rdev = devm_regulator_register(dev, &info->desc, &config);
if (IS_ERR(rdev)) {
dev_err(dev, "failed to register %s\n",
info->desc.name);
return PTR_ERR(rdev);
} }
ret = hi6421_spmi_regulator_probe_ldo(new_pdev, child, pmic);
if (ret < 0)
platform_device_put(new_pdev);
} }
of_node_put(regulators);
return 0; return 0;
} }
static int hi6421_spmi_regulator_remove(struct platform_device *pdev) static const struct platform_device_id hi6421_spmi_regulator_table[] = {
{
struct regulator_dev *rdev = dev_get_drvdata(&pdev->dev);
struct hi6421v600_regulator *sreg = rdev_get_drvdata(rdev);
regulator_unregister(rdev);
if (rdev->desc->volt_table)
devm_kfree(&pdev->dev, (unsigned int *)rdev->desc->volt_table);
kfree(sreg);
return 0;
}
static const struct platform_device_id hi6421v600_regulator_table[] = {
{ .name = "hi6421v600-regulator" }, { .name = "hi6421v600-regulator" },
{}, {},
}; };
MODULE_DEVICE_TABLE(platform, hi6421v600_regulator_table); MODULE_DEVICE_TABLE(platform, hi6421_spmi_regulator_table);
static struct platform_driver hi6421v600_regulator_driver = { static struct platform_driver hi6421_spmi_regulator_driver = {
.id_table = hi6421v600_regulator_table, .id_table = hi6421_spmi_regulator_table,
.driver = { .driver = {
.name = "hi6421v600-regulator", .name = "hi6421v600-regulator",
}, },
.probe = hi6421_spmi_regulator_probe, .probe = hi6421_spmi_regulator_probe,
.remove = hi6421_spmi_regulator_remove,
}; };
module_platform_driver(hi6421v600_regulator_driver); module_platform_driver(hi6421_spmi_regulator_driver);
MODULE_DESCRIPTION("Hi6421v600 regulator driver"); MODULE_DESCRIPTION("Hi6421v600 regulator driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");