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

Commit 1b887bf3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull an MFD fix from Lee Jones:
 "One simple fix to repair broken regulator probe() in DA9052"

* tag 'mfd-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: da9052: Fix broken regulator probe
parents 30a7266f e0c21530

drivers/mfd/da9052-core.c

+4 −4
Original line number Diff line number Diff line
@@ -431,6 +431,10 @@ int da9052_adc_read_temp(struct da9052 *da9052) 
EXPORT_SYMBOL_GPL(da9052_adc_read_temp);



static const struct mfd_cell da9052_subdev_info[] = {

	{

		.name = "da9052-regulator",

		.id = 0,

	},

	{

		.name = "da9052-regulator",

		.id = 1,
@@ -483,10 +487,6 @@ static const struct mfd_cell da9052_subdev_info[] = { 
		.name = "da9052-regulator",

		.id = 13,

	},

	{

		.name = "da9052-regulator",

		.id = 14,

	},

	{

		.name = "da9052-onkey",

	},

drivers/regulator/da9052-regulator.c

+3 −2
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id, 


static int da9052_regulator_probe(struct platform_device *pdev)

{

	const struct mfd_cell *cell = mfd_get_cell(pdev);

	struct regulator_config config = { };

	struct da9052_regulator *regulator;

	struct da9052 *da9052;
@@ -409,7 +410,7 @@ static int da9052_regulator_probe(struct platform_device *pdev) 
	regulator->da9052 = da9052;



	regulator->info = find_regulator_info(regulator->da9052->chip_id,

					      pdev->id);

					      cell->id);

	if (regulator->info == NULL) {

		dev_err(&pdev->dev, "invalid regulator ID specified\n");

		return -EINVAL;
@@ -419,7 +420,7 @@ static int da9052_regulator_probe(struct platform_device *pdev) 
	config.driver_data = regulator;

	config.regmap = da9052->regmap;

	if (pdata && pdata->regulators) {

		config.init_data = pdata->regulators[pdev->id];

		config.init_data = pdata->regulators[cell->id];

	} else {

#ifdef CONFIG_OF

		struct device_node *nproot = da9052->dev->of_node;