evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next

Browse source
This commit is contained in:
Mark Brown 2013-10-24 11:11:43 +01:00
commit d4d5cef649
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/regulator/tps65910-regulator.c
View file

@ -481,7 +481,7 @@ static int tps65910_get_voltage_dcdc_sel(struct regulator_dev *dev)
/* multiplier 0 == 1 but 2,3 normal */ /* multiplier 0 == 1 but 2,3 normal */
if (!mult) if (!mult)
mult=1; mult = 1;
if (sr) { if (sr) {
/* normalise to valid range */ /* normalise to valid range */
@ -685,7 +685,7 @@ static int tps65910_list_voltage_dcdc(struct regulator_dev *dev,
case TPS65910_REG_VDD2: case TPS65910_REG_VDD2:
mult = (selector / VDD1_2_NUM_VOLT_FINE) + 1; mult = (selector / VDD1_2_NUM_VOLT_FINE) + 1;
volt = VDD1_2_MIN_VOLT + volt = VDD1_2_MIN_VOLT +
(selector % VDD1_2_NUM_VOLT_FINE) * VDD1_2_OFFSET; (selector % VDD1_2_NUM_VOLT_FINE) * VDD1_2_OFFSET;
break; break;
case TPS65911_REG_VDDCTRL: case TPS65911_REG_VDDCTRL:
volt = VDDCTRL_MIN_VOLT + (selector * VDDCTRL_OFFSET); volt = VDDCTRL_MIN_VOLT + (selector * VDDCTRL_OFFSET);
@ -703,7 +703,7 @@ static int tps65911_list_voltage(struct regulator_dev *dev, unsigned selector)
struct tps65910_reg *pmic = rdev_get_drvdata(dev); struct tps65910_reg *pmic = rdev_get_drvdata(dev);
int step_mv = 0, id = rdev_get_id(dev); int step_mv = 0, id = rdev_get_id(dev);
switch(id) { switch (id) {
case TPS65911_REG_LDO1: case TPS65911_REG_LDO1:
case TPS65911_REG_LDO2: case TPS65911_REG_LDO2:
case TPS65911_REG_LDO4: case TPS65911_REG_LDO4:
@ -982,7 +982,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
} }
np = of_node_get(pdev->dev.parent->of_node); np = of_node_get(pdev->dev.parent->of_node);
regulators = of_find_node_by_name(np, "regulators"); regulators = of_get_child_by_name(np, "regulators");
if (!regulators) { if (!regulators) {
dev_err(&pdev->dev, "regulator node not found\n"); dev_err(&pdev->dev, "regulator node not found\n");
return NULL; return NULL;
@ -1074,7 +1074,7 @@ static int tps65910_probe(struct platform_device *pdev)
tps65910_reg_set_bits(pmic->mfd, TPS65910_DEVCTRL, tps65910_reg_set_bits(pmic->mfd, TPS65910_DEVCTRL,
DEVCTRL_SR_CTL_I2C_SEL_MASK); DEVCTRL_SR_CTL_I2C_SEL_MASK);
switch(tps65910_chip_id(tps65910)) { switch (tps65910_chip_id(tps65910)) {
case TPS65910: case TPS65910:
pmic->get_ctrl_reg = &tps65910_get_ctrl_register; pmic->get_ctrl_reg = &tps65910_get_ctrl_register;
pmic->num_regulators = ARRAY_SIZE(tps65910_regs); pmic->num_regulators = ARRAY_SIZE(tps65910_regs);