Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac58291c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/fix/max77686' into tmp

parents 88b62b91 b19f5758

drivers/regulator/max77686.c

+8 −7
Original line number Diff line number Diff line
@@ -379,9 +379,10 @@ static struct regulator_desc regulators[] = { 
};



#ifdef CONFIG_OF

static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,

static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev,

					struct max77686_platform_data *pdata)

{

	struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);

	struct device_node *pmic_np, *regulators_np;

	struct max77686_regulator_data *rdata;

	struct of_regulator_match rmatch;
@@ -390,15 +391,15 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev, 
	pmic_np = iodev->dev->of_node;

	regulators_np = of_find_node_by_name(pmic_np, "voltage-regulators");

	if (!regulators_np) {

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

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

		return -EINVAL;

	}



	pdata->num_regulators = ARRAY_SIZE(regulators);

	rdata = devm_kzalloc(iodev->dev, sizeof(*rdata) *

	rdata = devm_kzalloc(&pdev->dev, sizeof(*rdata) *

			     pdata->num_regulators, GFP_KERNEL);

	if (!rdata) {

		dev_err(iodev->dev,

		dev_err(&pdev->dev,

			"could not allocate memory for regulator data\n");

		return -ENOMEM;

	}
@@ -407,7 +408,7 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev, 
		rmatch.name = regulators[i].name;

		rmatch.init_data = NULL;

		rmatch.of_node = NULL;

		of_regulator_match(iodev->dev, regulators_np, &rmatch, 1);

		of_regulator_match(&pdev->dev, regulators_np, &rmatch, 1);

		rdata[i].initdata = rmatch.init_data;

		rdata[i].of_node = rmatch.of_node;

	}
@@ -417,7 +418,7 @@ static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev, 
	return 0;

}

#else

static int max77686_pmic_dt_parse_pdata(struct max77686_dev *iodev,

static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev,

					struct max77686_platform_data *pdata)

{

	return 0;
@@ -440,7 +441,7 @@ static int max77686_pmic_probe(struct platform_device *pdev) 
	}



	if (iodev->dev->of_node) {

		ret = max77686_pmic_dt_parse_pdata(iodev, pdata);

		ret = max77686_pmic_dt_parse_pdata(pdev, pdata);

		if (ret)

			return ret;

	}