diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:43 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:43 -0400 |
commit | d4d5cef649d1042454c286474343cec50ff1cb60 (patch) | |
tree | b5cf53ce79bbaeba98b7fc535d269fab81539df2 | |
parent | 2532a395003a2f6ea765f263aae39129a2bd828f (diff) | |
parent | 4b57927045c30d8f8579a43177459782f45f5468 (diff) |
Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next
-rw-r--r-- | drivers/regulator/tps65910-regulator.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index b8167df71170..23f8d1ce877d 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c | |||
@@ -481,7 +481,7 @@ static int tps65910_get_voltage_dcdc_sel(struct regulator_dev *dev) | |||
481 | 481 | ||
482 | /* multiplier 0 == 1 but 2,3 normal */ | 482 | /* multiplier 0 == 1 but 2,3 normal */ |
483 | if (!mult) | 483 | if (!mult) |
484 | mult=1; | 484 | mult = 1; |
485 | 485 | ||
486 | if (sr) { | 486 | if (sr) { |
487 | /* normalise to valid range */ | 487 | /* normalise to valid range */ |
@@ -685,7 +685,7 @@ static int tps65910_list_voltage_dcdc(struct regulator_dev *dev, | |||
685 | case TPS65910_REG_VDD2: | 685 | case TPS65910_REG_VDD2: |
686 | mult = (selector / VDD1_2_NUM_VOLT_FINE) + 1; | 686 | mult = (selector / VDD1_2_NUM_VOLT_FINE) + 1; |
687 | volt = VDD1_2_MIN_VOLT + | 687 | volt = VDD1_2_MIN_VOLT + |
688 | (selector % VDD1_2_NUM_VOLT_FINE) * VDD1_2_OFFSET; | 688 | (selector % VDD1_2_NUM_VOLT_FINE) * VDD1_2_OFFSET; |
689 | break; | 689 | break; |
690 | case TPS65911_REG_VDDCTRL: | 690 | case TPS65911_REG_VDDCTRL: |
691 | volt = VDDCTRL_MIN_VOLT + (selector * VDDCTRL_OFFSET); | 691 | volt = VDDCTRL_MIN_VOLT + (selector * VDDCTRL_OFFSET); |
@@ -703,7 +703,7 @@ static int tps65911_list_voltage(struct regulator_dev *dev, unsigned selector) | |||
703 | struct tps65910_reg *pmic = rdev_get_drvdata(dev); | 703 | struct tps65910_reg *pmic = rdev_get_drvdata(dev); |
704 | int step_mv = 0, id = rdev_get_id(dev); | 704 | int step_mv = 0, id = rdev_get_id(dev); |
705 | 705 | ||
706 | switch(id) { | 706 | switch (id) { |
707 | case TPS65911_REG_LDO1: | 707 | case TPS65911_REG_LDO1: |
708 | case TPS65911_REG_LDO2: | 708 | case TPS65911_REG_LDO2: |
709 | case TPS65911_REG_LDO4: | 709 | case TPS65911_REG_LDO4: |
@@ -982,7 +982,7 @@ static struct tps65910_board *tps65910_parse_dt_reg_data( | |||
982 | } | 982 | } |
983 | 983 | ||
984 | np = of_node_get(pdev->dev.parent->of_node); | 984 | np = of_node_get(pdev->dev.parent->of_node); |
985 | regulators = of_find_node_by_name(np, "regulators"); | 985 | regulators = of_get_child_by_name(np, "regulators"); |
986 | if (!regulators) { | 986 | if (!regulators) { |
987 | dev_err(&pdev->dev, "regulator node not found\n"); | 987 | dev_err(&pdev->dev, "regulator node not found\n"); |
988 | return NULL; | 988 | return NULL; |
@@ -1074,7 +1074,7 @@ static int tps65910_probe(struct platform_device *pdev) | |||
1074 | tps65910_reg_set_bits(pmic->mfd, TPS65910_DEVCTRL, | 1074 | tps65910_reg_set_bits(pmic->mfd, TPS65910_DEVCTRL, |
1075 | DEVCTRL_SR_CTL_I2C_SEL_MASK); | 1075 | DEVCTRL_SR_CTL_I2C_SEL_MASK); |
1076 | 1076 | ||
1077 | switch(tps65910_chip_id(tps65910)) { | 1077 | switch (tps65910_chip_id(tps65910)) { |
1078 | case TPS65910: | 1078 | case TPS65910: |
1079 | pmic->get_ctrl_reg = &tps65910_get_ctrl_register; | 1079 | pmic->get_ctrl_reg = &tps65910_get_ctrl_register; |
1080 | pmic->num_regulators = ARRAY_SIZE(tps65910_regs); | 1080 | pmic->num_regulators = ARRAY_SIZE(tps65910_regs); |