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

Commit 4e005179 authored by Robert Jarzmik's avatar Robert Jarzmik Committed by Mark Brown
Browse files

regulator: max1586: add device-tree support 



Add device-tree support to max1586.
The driver can still be used with the legacy platform data, or the new
device-tree way.

This work is heavily inspired by the device-tree support of its cousin
max8660 driver.

Signed-off-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7d1311b9

drivers/regulator/max1586.c

+79 −2
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include <linux/regulator/driver.h>

#include <linux/slab.h>

#include <linux/regulator/max1586.h>

#include <linux/of_device.h>

#include <linux/regulator/of_regulator.h>



#define MAX1586_V3_MAX_VSEL 31

#define MAX1586_V6_MAX_VSEL 3
@@ -157,13 +159,87 @@ static struct regulator_desc max1586_reg[] = { 
	},

};



int of_get_max1586_platform_data(struct device *dev,

				 struct max1586_platform_data *pdata)

{

	struct max1586_subdev_data *sub;

	struct of_regulator_match rmatch[ARRAY_SIZE(max1586_reg)];

	struct device_node *np = dev->of_node;

	int i, matched;



	if (of_property_read_u32(np, "v3-gain",

				 &pdata->v3_gain) < 0) {

		dev_err(dev, "%s has no 'v3-gain' property\n", np->full_name);

		return -EINVAL;

	}



	np = of_get_child_by_name(np, "regulators");

	if (!np) {

		dev_err(dev, "missing 'regulators' subnode in DT\n");

		return -EINVAL;

	}



	for (i = 0; i < ARRAY_SIZE(rmatch); i++)

		rmatch[i].name = max1586_reg[i].name;



	matched = of_regulator_match(dev, np, rmatch, ARRAY_SIZE(rmatch));

	of_node_put(np);

	/*

	 * If matched is 0, ie. neither Output_V3 nor Output_V6 have been found,

	 * return 0, which signals the normal situation where no subregulator is

	 * available. This is normal because the max1586 doesn't provide any

	 * readback support, so the subregulators can't report any status

	 * anyway.  If matched < 0, return the error.

	 */

	if (matched <= 0)

		return matched;



	pdata->subdevs = devm_kzalloc(dev, sizeof(struct max1586_subdev_data) *

						matched, GFP_KERNEL);

	if (!pdata->subdevs)

		return -ENOMEM;



	pdata->num_subdevs = matched;

	sub = pdata->subdevs;



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

		sub->id = i;

		sub->name = rmatch[i].of_node->name;

		sub->platform_data = rmatch[i].init_data;

		sub++;

	}



	return 0;

}



static const struct of_device_id max1586_of_match[] = {

	{ .compatible = "maxim,max1586", },

	{},

};

MODULE_DEVICE_TABLE(of, max1586_of_match);



static int max1586_pmic_probe(struct i2c_client *client,

					const struct i2c_device_id *i2c_id)

{

	struct max1586_platform_data *pdata = dev_get_platdata(&client->dev);

	struct max1586_platform_data *pdata, pdata_of;

	struct regulator_config config = { };

	struct max1586_data *max1586;

	int i, id;

	int i, id, ret;

	const struct of_device_id *match;



	pdata = dev_get_platdata(&client->dev);

	if (client->dev.of_node && !pdata) {

		match = of_match_device(of_match_ptr(max1586_of_match),

					&client->dev);

		if (!match) {

			dev_err(&client->dev, "Error: No device match found\n");

			return -ENODEV;

		}

		ret = of_get_max1586_platform_data(&client->dev, &pdata_of);

		if (ret < 0)

			return ret;

		pdata = &pdata_of;

	}



	max1586 = devm_kzalloc(&client->dev, sizeof(struct max1586_data),

			GFP_KERNEL);
@@ -229,6 +305,7 @@ static struct i2c_driver max1586_pmic_driver = { 
	.driver		= {

		.name	= "max1586",

		.owner	= THIS_MODULE,

		.of_match_table = of_match_ptr(max1586_of_match),

	},

	.id_table	= max1586_id,

};

include/linux/regulator/max1586.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
 */

struct max1586_subdev_data {

	int				id;

	char				*name;

	const char			*name;

	struct regulator_init_data	*platform_data;

};