Commit 3dfe6886 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.5-rc3' of... 

Merge tag 'regulator-fix-v6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A couple of small fixes for the the mt6358 driver, fixing error
  reporting and a bootstrapping issue"

* tag 'regulator-fix-v6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: mt6358: Fix incorrect VCN33 sync error message
  regulator: mt6358: Sync VCN33_* enable status after checking ID
parents 88f66f13 67cb6088

drivers/regulator/mt6358-regulator.c

+5 −5
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static int mt6358_sync_vcn33_setting(struct device *dev) 
	/* Disable VCN33_WIFI */

	ret = regmap_update_bits(mt6397->regmap, MT6358_LDO_VCN33_CON0_1, BIT(0), 0);

	if (ret) {

		dev_err(dev, "Failed to disable VCN33_BT\n");

		dev_err(dev, "Failed to disable VCN33_WIFI\n");

		return ret;

	}
@@ -676,10 +676,6 @@ static int mt6358_regulator_probe(struct platform_device *pdev) 
	const struct mt6358_regulator_info *mt6358_info;

	int i, max_regulator, ret;



	ret = mt6358_sync_vcn33_setting(&pdev->dev);

	if (ret)

		return ret;



	if (mt6397->chip_id == MT6366_CHIP_ID) {

		max_regulator = MT6366_MAX_REGULATOR;

		mt6358_info = mt6366_regulators;
@@ -688,6 +684,10 @@ static int mt6358_regulator_probe(struct platform_device *pdev) 
		mt6358_info = mt6358_regulators;

	}



	ret = mt6358_sync_vcn33_setting(&pdev->dev);

	if (ret)

		return ret;



	for (i = 0; i < max_regulator; i++) {

		config.dev = &pdev->dev;

		config.regmap = mt6397->regmap;