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

Commit 2c043bcb authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Mark Brown
Browse files

regulator: pass additional of_node to regulator_register() 



With device tree support for regulators, its needed that the
regulator_dev->dev device has the right of_node attached.
To be able to do this add an additional parameter to the
regulator_register() api, wherein the dt-adapted driver can
then pass this additional info onto the regulator core.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent cef49102

drivers/regulator/88pm8607.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static int __devinit pm8607_regulator_probe(struct platform_device *pdev) 


	/* replace driver_data with info */

	info->regulator = regulator_register(&info->desc, &pdev->dev,

					     pdata, info);

					     pdata, info, NULL);

	if (IS_ERR(info->regulator)) {

		dev_err(&pdev->dev, "failed to register regulator %s\n",

			info->desc.name);

drivers/regulator/aat2870-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev) 
	ri->pdev = pdev;



	rdev = regulator_register(&ri->desc, &pdev->dev,

				  pdev->dev.platform_data, ri);

				  pdev->dev.platform_data, ri, NULL);

	if (IS_ERR(rdev)) {

		dev_err(&pdev->dev, "Failed to register regulator %s\n",

			ri->desc.name);

drivers/regulator/ab3100.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ static int __devinit ab3100_regulators_probe(struct platform_device *pdev) 
		rdev = regulator_register(&ab3100_regulator_desc[i],

					  &pdev->dev,

					  &plfdata->reg_constraints[i],

					  reg);

					  reg, NULL);



		if (IS_ERR(rdev)) {

			err = PTR_ERR(rdev);

drivers/regulator/ab8500.c

+1 −1
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev) 


		/* register regulator with framework */

		info->regulator = regulator_register(&info->desc, &pdev->dev,

				&pdata->regulator[i], info);

				&pdata->regulator[i], info, NULL);

		if (IS_ERR(info->regulator)) {

			err = PTR_ERR(info->regulator);

			dev_err(&pdev->dev, "failed to register regulator %s\n",

drivers/regulator/ad5398.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static int __devinit ad5398_probe(struct i2c_client *client, 
	chip->current_mask = (chip->current_level - 1) << chip->current_offset;



	chip->rdev = regulator_register(&ad5398_reg, &client->dev,

					init_data, chip);

					init_data, chip, NULL);

	if (IS_ERR(chip->rdev)) {

		ret = PTR_ERR(chip->rdev);

		dev_err(&client->dev, "failed to register %s %s\n",