Merge remote-tracking branches 'regulator/fix/da9063', 'regulator/fix/max14577' and 'regulator/fix/s5m8767' into regulator-linus

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Mark Brown 12 years ago bcad2ca3 f29d778f

+9 -4

3 changed files

expand all

drivers

regulator

da9063-regulator.c

max14577.c

s5m8767.c

+3 -1

drivers/regulator/da9063-regulator.c

··· 1 + 1 2 /* 2 3 * Regulator driver for DA9063 PMIC series 3 4 * ··· 61 60 .desc.ops = &da9063_ldo_ops, \ 62 61 .desc.min_uV = (min_mV) * 1000, \ 63 62 .desc.uV_step = (step_mV) * 1000, \ 64 - .desc.n_voltages = (((max_mV) - (min_mV))/(step_mV) + 1), \ 63 + .desc.n_voltages = (((max_mV) - (min_mV))/(step_mV) + 1 \ 64 + + (DA9063_V##regl_name##_BIAS)), \ 65 65 .desc.enable_reg = DA9063_REG_##regl_name##_CONT, \ 66 66 .desc.enable_mask = DA9063_LDO_EN, \ 67 67 .desc.vsel_reg = DA9063_REG_V##regl_name##_A, \

+3 -2

drivers/regulator/max14577.c

··· 166 166 167 167 ret = of_regulator_match(&pdev->dev, np, max14577_regulator_matches, 168 168 MAX14577_REG_MAX); 169 - if (ret < 0) { 169 + if (ret < 0) 170 170 dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", ret); 171 - } 171 + else 172 + ret = 0; 172 173 173 174 of_node_put(np); 174 175

+3 -1

drivers/regulator/s5m8767.c

··· 535 535 return -ENODEV; 536 536 } 537 537 538 - regulators_np = of_find_node_by_name(pmic_np, "regulators"); 538 + regulators_np = of_get_child_by_name(pmic_np, "regulators"); 539 539 if (!regulators_np) { 540 540 dev_err(iodev->dev, "could not find regulators sub-node\n"); 541 541 return -EINVAL; ··· 590 590 } 591 591 rmode++; 592 592 } 593 + 594 + of_node_put(regulators_np); 593 595 594 596 if (of_get_property(pmic_np, "s5m8767,pmic-buck2-uses-gpio-dvs", NULL)) { 595 597 pdata->buck2_gpiodvs = true;