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

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

regulator: max77686: 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>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 75ff9420

drivers/regulator/max77686.c

+19 −72
Original line number Original line Diff line number Diff line
@@ -281,6 +281,8 @@ static struct regulator_ops max77686_buck_dvs_ops = { 




#define regulator_desc_ldo(num)		{				\

#define regulator_desc_ldo(num)		{				\

	.name		= "LDO"#num,					\

	.name		= "LDO"#num,					\

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

	.regulators_node	= of_match_ptr("voltage-regulators"),	\

	.id		= MAX77686_LDO##num,				\

	.id		= MAX77686_LDO##num,				\

	.ops		= &max77686_ops,				\

	.ops		= &max77686_ops,				\

	.type		= REGULATOR_VOLTAGE,				\

	.type		= REGULATOR_VOLTAGE,				\
@@ -297,6 +299,8 @@ static struct regulator_ops max77686_buck_dvs_ops = { 
}

}

#define regulator_desc_lpm_ldo(num)	{				\

#define regulator_desc_lpm_ldo(num)	{				\

	.name		= "LDO"#num,					\

	.name		= "LDO"#num,					\

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

	.regulators_node	= of_match_ptr("voltage-regulators"),	\

	.id		= MAX77686_LDO##num,				\

	.id		= MAX77686_LDO##num,				\

	.ops		= &max77686_ldo_ops,				\

	.ops		= &max77686_ldo_ops,				\

	.type		= REGULATOR_VOLTAGE,				\

	.type		= REGULATOR_VOLTAGE,				\
@@ -313,6 +317,8 @@ static struct regulator_ops max77686_buck_dvs_ops = { 
}

}

#define regulator_desc_ldo_low(num)		{			\

#define regulator_desc_ldo_low(num)		{			\

	.name		= "LDO"#num,					\

	.name		= "LDO"#num,					\

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

	.regulators_node	= of_match_ptr("voltage-regulators"),	\

	.id		= MAX77686_LDO##num,				\

	.id		= MAX77686_LDO##num,				\

	.ops		= &max77686_ldo_ops,				\

	.ops		= &max77686_ldo_ops,				\

	.type		= REGULATOR_VOLTAGE,				\

	.type		= REGULATOR_VOLTAGE,				\
@@ -329,6 +335,8 @@ static struct regulator_ops max77686_buck_dvs_ops = { 
}

}

#define regulator_desc_ldo1_low(num)		{			\

#define regulator_desc_ldo1_low(num)		{			\

	.name		= "LDO"#num,					\

	.name		= "LDO"#num,					\

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

	.regulators_node	= of_match_ptr("voltage-regulators"),	\

	.id		= MAX77686_LDO##num,				\

	.id		= MAX77686_LDO##num,				\

	.ops		= &max77686_ops,				\

	.ops		= &max77686_ops,				\

	.type		= REGULATOR_VOLTAGE,				\

	.type		= REGULATOR_VOLTAGE,				\
@@ -345,6 +353,8 @@ static struct regulator_ops max77686_buck_dvs_ops = { 
}

}

#define regulator_desc_buck(num)		{			\

#define regulator_desc_buck(num)		{			\

	.name		= "BUCK"#num,					\

	.name		= "BUCK"#num,					\

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

	.regulators_node	= of_match_ptr("voltage-regulators"),	\

	.id		= MAX77686_BUCK##num,				\

	.id		= MAX77686_BUCK##num,				\

	.ops		= &max77686_ops,				\

	.ops		= &max77686_ops,				\

	.type		= REGULATOR_VOLTAGE,				\

	.type		= REGULATOR_VOLTAGE,				\
@@ -360,6 +370,8 @@ static struct regulator_ops max77686_buck_dvs_ops = { 
}

}

#define regulator_desc_buck1(num)		{			\

#define regulator_desc_buck1(num)		{			\

	.name		= "BUCK"#num,					\

	.name		= "BUCK"#num,					\

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

	.regulators_node	= of_match_ptr("voltage-regulators"),	\

	.id		= MAX77686_BUCK##num,				\

	.id		= MAX77686_BUCK##num,				\

	.ops		= &max77686_buck1_ops,				\

	.ops		= &max77686_buck1_ops,				\

	.type		= REGULATOR_VOLTAGE,				\

	.type		= REGULATOR_VOLTAGE,				\
@@ -375,6 +387,8 @@ static struct regulator_ops max77686_buck_dvs_ops = { 
}

}

#define regulator_desc_buck_dvs(num)		{			\

#define regulator_desc_buck_dvs(num)		{			\

	.name		= "BUCK"#num,					\

	.name		= "BUCK"#num,					\

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

	.regulators_node	= of_match_ptr("voltage-regulators"),	\

	.id		= MAX77686_BUCK##num,				\

	.id		= MAX77686_BUCK##num,				\

	.ops		= &max77686_buck_dvs_ops,			\

	.ops		= &max77686_buck_dvs_ops,			\

	.type		= REGULATOR_VOLTAGE,				\

	.type		= REGULATOR_VOLTAGE,				\
@@ -428,86 +442,21 @@ static const struct regulator_desc regulators[] = { 
	regulator_desc_buck(9),

	regulator_desc_buck(9),

};

};





#ifdef CONFIG_OF

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

	unsigned int i;



	pmic_np = iodev->dev->of_node;

	regulators_np = of_get_child_by_name(pmic_np, "voltage-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;

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

		rdata[i].initdata = rmatch.init_data;

		rdata[i].of_node = rmatch.of_node;

	}



	pdata->regulators = rdata;

	of_node_put(regulators_np);



	return 0;

}

#else

static int max77686_pmic_dt_parse_pdata(struct platform_device *pdev,

					struct max77686_platform_data *pdata)

{

	return 0;

}

#endif /* CONFIG_OF */



static int max77686_pmic_probe(struct platform_device *pdev)

static int max77686_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 max77686_data *max77686;

	struct max77686_data *max77686;

	int i, ret = 0;

	int i;

	struct regulator_config config = { };

	struct regulator_config config = { };





	dev_dbg(&pdev->dev, "%s\n", __func__);

	dev_dbg(&pdev->dev, "%s\n", __func__);





	if (!pdata) {

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

		return -ENODEV;

	}



	if (iodev->dev->of_node) {

		ret = max77686_pmic_dt_parse_pdata(pdev, pdata);

		if (ret)

			return ret;

	}



	if (pdata->num_regulators != MAX77686_REGULATORS) {

		dev_err(&pdev->dev,

			"Invalid initial data for regulator's initialiation\n");

		return -EINVAL;

	}



	max77686 = devm_kzalloc(&pdev->dev, sizeof(struct max77686_data),

	max77686 = devm_kzalloc(&pdev->dev, sizeof(struct max77686_data),

				GFP_KERNEL);

				GFP_KERNEL);

	if (!max77686)

	if (!max77686)

		return -ENOMEM;

		return -ENOMEM;





	config.dev = &pdev->dev;

	config.dev = iodev->dev;

	config.regmap = iodev->regmap;

	config.regmap = iodev->regmap;

	config.driver_data = max77686;

	config.driver_data = max77686;

	platform_set_drvdata(pdev, max77686);

	platform_set_drvdata(pdev, max77686);
@@ -516,16 +465,14 @@ static int max77686_pmic_probe(struct platform_device *pdev) 
		struct regulator_dev *rdev;

		struct regulator_dev *rdev;

		int id = regulators[i].id;

		int id = regulators[i].id;





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

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



		max77686->opmode[id] = MAX77686_NORMAL;

		max77686->opmode[id] = MAX77686_NORMAL;

		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)) {

			int 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;

		}

		}

	}

	}