Commit 24c85258 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator 

Pull regulator fixes from Mark Brown:
 "Mostly unexciting driver fixes, plus one fix to lower the severity of
  the log message when we don't use an optional regulator - the fixes
  for ACPI system made this come up more often and it was correctly
  observed that it was causing undue concern for users"

* tag 'regulator-v3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: max14577: Fix invalid return value on DT parse success
  regulator: core: Change dummy supplies error message to a warning
  regulator: s5m8767: Add missing of_node_put
  regulator: s5m8767: Use of_get_child_by_name
  regulator: da9063: Bug fix when setting max voltage on LDOs 5-11
parents b2880eb8 bcad2ca3

drivers/regulator/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1359,7 +1359,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, 
		goto found;

	/* Don't log an error when called from regulator_get_optional() */

	} else if (!have_full_constraints() || exclusive) {

		dev_err(dev, "dummy supplies not allowed\n");

		dev_warn(dev, "dummy supplies not allowed\n");

	}



	mutex_unlock(&regulator_list_mutex);

drivers/regulator/da9063-regulator.c

+3 −1
Original line number Diff line number Diff line 


/*

 * Regulator driver for DA9063 PMIC series

 *
@@ -60,7 +61,8 @@ struct da9063_regulator_info { 
	.desc.ops = &da9063_ldo_ops, \

	.desc.min_uV = (min_mV) * 1000, \

	.desc.uV_step = (step_mV) * 1000, \

	.desc.n_voltages = (((max_mV) - (min_mV))/(step_mV) + 1), \

	.desc.n_voltages = (((max_mV) - (min_mV))/(step_mV) + 1 \

		+ (DA9063_V##regl_name##_BIAS)), \

	.desc.enable_reg = DA9063_REG_##regl_name##_CONT, \

	.desc.enable_mask = DA9063_LDO_EN, \

	.desc.vsel_reg = DA9063_REG_V##regl_name##_A, \

drivers/regulator/max14577.c

+3 −2
Original line number Diff line number Diff line
@@ -166,9 +166,10 @@ static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev) 


	ret = of_regulator_match(&pdev->dev, np, max14577_regulator_matches,

			MAX14577_REG_MAX);

	if (ret < 0) {

	if (ret < 0)

		dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", ret);

	}

	else

		ret = 0;



	of_node_put(np);

drivers/regulator/s5m8767.c

+3 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, 
		return -ENODEV;

	}



	regulators_np = of_find_node_by_name(pmic_np, "regulators");

	regulators_np = of_get_child_by_name(pmic_np, "regulators");

	if (!regulators_np) {

		dev_err(iodev->dev, "could not find regulators sub-node\n");

		return -EINVAL;
@@ -591,6 +591,8 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, 
		rmode++;

	}



	of_node_put(regulators_np);



	if (of_get_property(pmic_np, "s5m8767,pmic-buck2-uses-gpio-dvs", NULL)) {

		pdata->buck2_gpiodvs = true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE