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

Commit ff633bea authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

regulator: max77802: Remove support for board files 



The driver is used only on Exynos based boards with DTS support.
Simplify the driver and remove dead (unused) entries in platform_data
structure.

Convert the driver to DTS-only version. Parse all regulators at once,
not one-by-one. Remove dependency on data provided by max77686 MFD
driver. Use new DT style parsing method for regulators init data.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: default avatarJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cf2394f7

drivers/regulator/max77802.c

+19 −73
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ static unsigned int ramp_table_77802_4bit[] = { 
};

};





struct max77802_regulator_prv {

struct max77802_regulator_prv {

	/* Array indexed by regulator id */

	unsigned int opmode[MAX77802_REG_MAX];

	unsigned int opmode[MAX77802_REG_MAX];

};

};
@@ -362,6 +363,8 @@ static struct regulator_ops max77802_buck_dvs_ops = { 
/* LDOs 3-7, 9-14, 18-26, 28, 29, 32-34 */

/* LDOs 3-7, 9-14, 18-26, 28, 29, 32-34 */

#define regulator_77802_desc_p_ldo(num, supply, log)	{		\

#define regulator_77802_desc_p_ldo(num, supply, log)	{		\

	.name		= "LDO"#num,					\

	.name		= "LDO"#num,					\

	.of_match	= of_match_ptr("LDO"#num),			\

	.regulators_node	= of_match_ptr("regulators"),		\

	.id		= MAX77802_LDO##num,				\

	.id		= MAX77802_LDO##num,				\

	.supply_name	= "inl"#supply,					\

	.supply_name	= "inl"#supply,					\

	.ops		= &max77802_ldo_ops_logic##log,			\

	.ops		= &max77802_ldo_ops_logic##log,			\
@@ -381,6 +384,8 @@ static struct regulator_ops max77802_buck_dvs_ops = { 
/* LDOs 1, 2, 8, 15, 17, 27, 30, 35 */

/* LDOs 1, 2, 8, 15, 17, 27, 30, 35 */

#define regulator_77802_desc_n_ldo(num, supply, log)   {		\

#define regulator_77802_desc_n_ldo(num, supply, log)   {		\

	.name		= "LDO"#num,					\

	.name		= "LDO"#num,					\

	.of_match	= of_match_ptr("LDO"#num),			\

	.regulators_node	= of_match_ptr("regulators"),		\

	.id		= MAX77802_LDO##num,				\

	.id		= MAX77802_LDO##num,				\

	.supply_name	= "inl"#supply,					\

	.supply_name	= "inl"#supply,					\

	.ops		= &max77802_ldo_ops_logic##log,			\

	.ops		= &max77802_ldo_ops_logic##log,			\
@@ -400,6 +405,8 @@ static struct regulator_ops max77802_buck_dvs_ops = { 
/* BUCKs 1, 6 */

/* BUCKs 1, 6 */

#define regulator_77802_desc_16_buck(num)	{		\

#define regulator_77802_desc_16_buck(num)	{		\

	.name		= "BUCK"#num,					\

	.name		= "BUCK"#num,					\

	.of_match	= of_match_ptr("BUCK"#num),			\

	.regulators_node	= of_match_ptr("regulators"),		\

	.id		= MAX77802_BUCK##num,				\

	.id		= MAX77802_BUCK##num,				\

	.supply_name	= "inb"#num,					\

	.supply_name	= "inb"#num,					\

	.ops		= &max77802_buck_16_dvs_ops,			\

	.ops		= &max77802_buck_16_dvs_ops,			\
@@ -419,6 +426,8 @@ static struct regulator_ops max77802_buck_dvs_ops = { 
/* BUCKS 2-4 */

/* BUCKS 2-4 */

#define regulator_77802_desc_234_buck(num)	{		\

#define regulator_77802_desc_234_buck(num)	{		\

	.name		= "BUCK"#num,					\

	.name		= "BUCK"#num,					\

	.of_match	= of_match_ptr("BUCK"#num),			\

	.regulators_node	= of_match_ptr("regulators"),		\

	.id		= MAX77802_BUCK##num,				\

	.id		= MAX77802_BUCK##num,				\

	.supply_name	= "inb"#num,					\

	.supply_name	= "inb"#num,					\

	.ops		= &max77802_buck_234_ops,			\

	.ops		= &max77802_buck_234_ops,			\
@@ -439,6 +448,8 @@ static struct regulator_ops max77802_buck_dvs_ops = { 
/* BUCK 5 */

/* BUCK 5 */

#define regulator_77802_desc_buck5(num)		{		\

#define regulator_77802_desc_buck5(num)		{		\

	.name		= "BUCK"#num,					\

	.name		= "BUCK"#num,					\

	.of_match	= of_match_ptr("BUCK"#num),			\

	.regulators_node	= of_match_ptr("regulators"),		\

	.id		= MAX77802_BUCK##num,				\

	.id		= MAX77802_BUCK##num,				\

	.supply_name	= "inb"#num,					\

	.supply_name	= "inb"#num,					\

	.ops		= &max77802_buck_dvs_ops,			\

	.ops		= &max77802_buck_dvs_ops,			\
@@ -458,6 +469,8 @@ static struct regulator_ops max77802_buck_dvs_ops = { 
/* BUCKs 7-10 */

/* BUCKs 7-10 */

#define regulator_77802_desc_buck7_10(num)	{		\

#define regulator_77802_desc_buck7_10(num)	{		\

	.name		= "BUCK"#num,					\

	.name		= "BUCK"#num,					\

	.of_match	= of_match_ptr("BUCK"#num),			\

	.regulators_node	= of_match_ptr("regulators"),		\

	.id		= MAX77802_BUCK##num,				\

	.id		= MAX77802_BUCK##num,				\

	.supply_name	= "inb"#num,					\

	.supply_name	= "inb"#num,					\

	.ops		= &max77802_buck_dvs_ops,			\

	.ops		= &max77802_buck_dvs_ops,			\
@@ -519,85 +532,19 @@ static const struct regulator_desc regulators[] = { 
	regulator_77802_desc_n_ldo(35, 2, 1),

	regulator_77802_desc_n_ldo(35, 2, 1),

};

};





#ifdef CONFIG_OF

static int max77802_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 = { };

	unsigned int i;



	pmic_np = iodev->dev->of_node;

	regulators_np = of_get_child_by_name(pmic_np, "regulators");

	if (!regulators_np) {

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

		return -EINVAL;

	}



	pdata->num_regulators = ARRAY_SIZE(regulators);

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

			     pdata->num_regulators, GFP_KERNEL);

	if (!rdata) {

		of_node_put(regulators_np);

		return -ENOMEM;

	}



	for (i = 0; i < pdata->num_regulators; i++) {

		rmatch.name = regulators[i].name;

		rmatch.init_data = NULL;

		rmatch.of_node = NULL;

		if (of_regulator_match(&pdev->dev, regulators_np, &rmatch,

				       1) != 1) {

			dev_warn(&pdev->dev, "No matching regulator for '%s'\n",

				 rmatch.name);

			continue;

		}

		rdata[i].initdata = rmatch.init_data;

		rdata[i].of_node = rmatch.of_node;

		rdata[i].id = regulators[i].id;

	}



	pdata->regulators = rdata;

	of_node_put(regulators_np);



	return 0;

}

#else

static int max77802_pmic_dt_parse_pdata(struct platform_device *pdev,

					struct max77686_platform_data *pdata)

{

	return 0;

}

#endif /* CONFIG_OF */



static int max77802_pmic_probe(struct platform_device *pdev)

static int max77802_pmic_probe(struct platform_device *pdev)

{

{

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

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

	struct max77686_platform_data *pdata = dev_get_platdata(iodev->dev);

	struct max77802_regulator_prv *max77802;

	struct max77802_regulator_prv *max77802;

	int i, ret = 0, val;

	int i, val;

	struct regulator_config config = { };

	struct regulator_config config = { };





	/* This is allocated by the MFD driver */

	if (!pdata) {

		dev_err(&pdev->dev, "no platform data found for regulator\n");

		return -ENODEV;

	}



	max77802 = devm_kzalloc(&pdev->dev,

	max77802 = devm_kzalloc(&pdev->dev,

				sizeof(struct max77802_regulator_prv),

				sizeof(struct max77802_regulator_prv),

				GFP_KERNEL);

				GFP_KERNEL);

	if (!max77802)

	if (!max77802)

		return -ENOMEM;

		return -ENOMEM;





	if (iodev->dev->of_node) {

		ret = max77802_pmic_dt_parse_pdata(pdev, pdata);

		if (ret)

			return ret;

	}



	config.dev = iodev->dev;

	config.dev = iodev->dev;

	config.regmap = iodev->regmap;

	config.regmap = iodev->regmap;

	config.driver_data = max77802;

	config.driver_data = max77802;
@@ -605,11 +552,9 @@ static int max77802_pmic_probe(struct platform_device *pdev) 




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

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

		struct regulator_dev *rdev;

		struct regulator_dev *rdev;

		int id = pdata->regulators[i].id;

		int id = regulators[i].id;

		int shift = max77802_get_opmode_shift(id);

		int shift = max77802_get_opmode_shift(id);



		int ret;

		config.init_data = pdata->regulators[i].initdata;

		config.of_node = pdata->regulators[i].of_node;





		ret = regmap_read(iodev->regmap, regulators[i].enable_reg, &val);

		ret = regmap_read(iodev->regmap, regulators[i].enable_reg, &val);

		if (ret < 0) {

		if (ret < 0) {
@@ -633,9 +578,10 @@ static int max77802_pmic_probe(struct platform_device *pdev) 
		rdev = devm_regulator_register(&pdev->dev,

		rdev = devm_regulator_register(&pdev->dev,

					       &regulators[i], &config);

					       &regulators[i], &config);

		if (IS_ERR(rdev)) {

		if (IS_ERR(rdev)) {

			ret = PTR_ERR(rdev);

			dev_err(&pdev->dev,

			dev_err(&pdev->dev,

				"regulator init failed for %d\n", i);

				"regulator init failed for %d: %d\n", i, ret);

			return PTR_ERR(rdev);

			return ret;

		}

		}

	}

	}