regulator: lochnagar: Move driver to binding from DT (d90acbc4) · Commits · 戴 / test

drivers/regulator/lochnagar-regulator.c

+37 −11

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include <linux/module.h>
		#include <linux/mutex.h>
		#include <linux/of.h>
		#include <linux/of_device.h>
		#include <linux/platform_device.h>
		#include <linux/regmap.h>
		#include <linux/regulator/driver.h>
		@@ -214,20 +215,45 @@ static const struct regulator_desc lochnagar_regulators[] = {
		},
		};

		static const struct of_device_id lochnagar_of_match[] = {
		{
		.compatible = "cirrus,lochnagar2-micvdd",
		.data = &lochnagar_regulators[LOCHNAGAR_MICVDD],
		},
		{
		.compatible = "cirrus,lochnagar2-mic1vdd",
		.data = &lochnagar_regulators[LOCHNAGAR_MIC1VDD],
		},
		{
		.compatible = "cirrus,lochnagar2-mic2vdd",
		.data = &lochnagar_regulators[LOCHNAGAR_MIC1VDD],
		},
		{
		.compatible = "cirrus,lochnagar2-vddcore",
		.data = &lochnagar_regulators[LOCHNAGAR_VDDCORE],
		},
		{},
		};

		static int lochnagar_regulator_probe(struct platform_device *pdev)
		{
		struct device *dev = &pdev->dev;
		struct lochnagar *lochnagar = dev_get_drvdata(dev->parent);
		struct regulator_config config = { };
		const struct of_device_id *of_id;
		const struct regulator_desc *desc;
		struct regulator_dev *rdev;
		int ret, i;
		int ret;

		config.dev = lochnagar->dev;
		config.dev = dev;
		config.regmap = lochnagar->regmap;
		config.driver_data = lochnagar;

		for (i = 0; i < ARRAY_SIZE(lochnagar_regulators); i++) {
		const struct regulator_desc *desc = &lochnagar_regulators[i];
		of_id = of_match_device(lochnagar_of_match, dev);
		if (!of_id)
		return -EINVAL;

		desc = of_id->data;

		rdev = devm_regulator_register(dev, desc, &config);
		if (IS_ERR(rdev)) {
		@@ -236,7 +262,6 @@ static int lochnagar_regulator_probe(struct platform_device *pdev)
		desc->name, ret);
		return ret;
		}
		}

		return 0;
		}
		@@ -244,6 +269,7 @@ static int lochnagar_regulator_probe(struct platform_device *pdev)
		static struct platform_driver lochnagar_regulator_driver = {
		.driver = {
		.name = "lochnagar-regulator",
		.of_match_table = of_match_ptr(lochnagar_of_match),
		},

		.probe = lochnagar_regulator_probe,

Admin message