TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "regulator: qpnp-lcdb: Add n_voltages property for LCDB regulators"

Browse Source
This commit is contained in:
qctecmdr
2021-04-21 19:55:05 -07:00
committed by Gerrit - the friendly Code Review server
parent 0bc230b194 7a3ec1cd36
commit b78aef07f9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/qpnp-lcdb-regulator.c
View File

@@ -1509,7 +1509,7 @@ static struct regulator_ops qpnp_lcdb_ncp_ops = {
static int qpnp_lcdb_regulator_register(struct qpnp_lcdb *lcdb, u8 type) static int qpnp_lcdb_regulator_register(struct qpnp_lcdb *lcdb, u8 type)
{ {
int rc = 0, off_on_delay = 0; int rc = 0, off_on_delay = 0, voltage_step = VOLTAGE_STEP_50_MV;
struct regulator_init_data *init_data; struct regulator_init_data *init_data;
struct regulator_config cfg = {}; struct regulator_config cfg = {};
struct regulator_desc *rdesc; struct regulator_desc *rdesc;
@@ -1524,12 +1524,16 @@ static int qpnp_lcdb_regulator_register(struct qpnp_lcdb *lcdb, u8 type)
rdesc = &lcdb->ldo.rdesc; rdesc = &lcdb->ldo.rdesc;
rdesc->ops = &qpnp_lcdb_ldo_ops; rdesc->ops = &qpnp_lcdb_ldo_ops;
rdesc->off_on_delay = off_on_delay; rdesc->off_on_delay = off_on_delay;
rdesc->n_voltages = ((MAX_VOLTAGE_MV - MIN_VOLTAGE_MV)
/ voltage_step) + 1;
rdev = lcdb->ldo.rdev; rdev = lcdb->ldo.rdev;
} else if (type == NCP) { } else if (type == NCP) {
node = lcdb->ncp.node; node = lcdb->ncp.node;
rdesc = &lcdb->ncp.rdesc; rdesc = &lcdb->ncp.rdesc;
rdesc->ops = &qpnp_lcdb_ncp_ops; rdesc->ops = &qpnp_lcdb_ncp_ops;
rdesc->off_on_delay = off_on_delay; rdesc->off_on_delay = off_on_delay;
rdesc->n_voltages = ((MAX_VOLTAGE_MV - MIN_VOLTAGE_MV)
/ voltage_step) + 1;
rdev = lcdb->ncp.rdev; rdev = lcdb->ncp.rdev;
} else { } else {
pr_err("Invalid regulator type %d\n", type); pr_err("Invalid regulator type %d\n", type);