Commit 463e1337 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v7.0-rc1' of... 

Merge tag 'regulator-fix-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A small pile of fixes, none of which are super major - the code fixes
  are improved error handling and fixing a leak of a device node.

  We also have a typo fix and an improvement to make the binding example
  for mt6359 more directly usable"

* tag 'regulator-fix-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Kconfig: fix a typo
  regulator: bq257xx: Fix device node reference leak in bq257xx_reg_dt_parse_gpio()
  regulator: fp9931: Fix PM runtime reference leak in fp9931_hwmon_read()
  regulator: tps65185: check devm_kzalloc() result in probe
  regulator: dt-bindings: mt6359: make regulator names unique
parents 201795a1 bfd7db78

Documentation/devicetree/bindings/regulator/mt6359-regulator.yaml

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ examples: 
          regulator-max-microvolt = <1700000>;

        };

        mt6359_vrfck_1_ldo_reg: ldo_vrfck_1 {

          regulator-name = "vrfck";

          regulator-name = "vrfck_1";

          regulator-min-microvolt = <1240000>;

          regulator-max-microvolt = <1600000>;

        };
@@ -309,7 +309,7 @@ examples: 
          regulator-max-microvolt = <3300000>;

        };

        mt6359_vemc_1_ldo_reg: ldo_vemc_1 {

          regulator-name = "vemc";

          regulator-name = "vemc_1";

          regulator-min-microvolt = <2500000>;

          regulator-max-microvolt = <3300000>;

        };

drivers/regulator/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ config REGULATOR_FP9931 
	  This driver supports the FP9931/JD9930 voltage regulator chip

	  which is used to provide power to Electronic Paper Displays

	  so it is found in E-Book readers.

	  If HWWON is enabled, it also provides temperature measurement.

	  If HWMON is enabled, it also provides temperature measurement.



config REGULATOR_LM363X

	tristate "TI LM363X voltage regulators"

drivers/regulator/bq257xx-regulator.c

+1 −2
Original line number Diff line number Diff line
@@ -115,11 +115,10 @@ static void bq257xx_reg_dt_parse_gpio(struct platform_device *pdev) 
		return;



	subchild = of_get_child_by_name(child, pdata->desc.of_match);

	of_node_put(child);

	if (!subchild)

		return;



	of_node_put(child);



	pdata->otg_en_gpio = devm_fwnode_gpiod_get_index(&pdev->dev,

							 of_fwnode_handle(subchild),

							 "enable", 0,

drivers/regulator/fp9931.c

+3 −4
Original line number Diff line number Diff line
@@ -144,13 +144,12 @@ static int fp9931_hwmon_read(struct device *dev, enum hwmon_sensor_types type, 
		return ret;



	ret = regmap_read(data->regmap, FP9931_REG_TMST_VALUE, &val);

	if (ret)

		return ret;

	if (!ret)

		*temp = (s8)val * 1000;



	pm_runtime_put_autosuspend(data->dev);

	*temp = (s8)val * 1000;



	return 0;

	return ret;

}



static umode_t fp9931_hwmon_is_visible(const void *data,

drivers/regulator/tps65185.c

+3 −0
Original line number Diff line number Diff line
@@ -332,6 +332,9 @@ static int tps65185_probe(struct i2c_client *client) 
	int i;



	data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;



	data->regmap = devm_regmap_init_i2c(client, &regmap_config);

	if (IS_ERR(data->regmap))

		return dev_err_probe(&client->dev, PTR_ERR(data->regmap),