regulator: pwm-regulator: get voltage and duty table from dts (aa66cc66) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/regulator/Kconfig

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -449,6 +449,13 @@ config REGULATOR_PFUZE100
	Say y here to support the regulators found on the Freescale		Say y here to support the regulators found on the Freescale
	PFUZE100/PFUZE200 PMIC.		PFUZE100/PFUZE200 PMIC.

			config REGULATOR_PWM
			tristate "PWM voltage regulator"
			depends on PWM
			help
			This driver supports PWM controlled voltage regulators. PWM
			duty cycle can increase or decrease the voltage.

	config REGULATOR_RC5T583		config REGULATOR_RC5T583
	tristate "RICOH RC5T583 Power regulators"		tristate "RICOH RC5T583 Power regulators"
	depends on MFD_RC5T583		depends on MFD_RC5T583
	@@ -483,12 +490,6 @@ config REGULATOR_S5M8767
	via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and		via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and
	supports DVS mode with 8bits of output voltage control.		supports DVS mode with 8bits of output voltage control.

	config REGULATOR_ST_PWM
	tristate "STMicroelectronics PWM voltage regulator"
	depends on ARCH_STI
	help
	This driver supports ST's PWM controlled voltage regulators.

	config REGULATOR_TI_ABB		config REGULATOR_TI_ABB
	tristate "TI Adaptive Body Bias on-chip LDO"		tristate "TI Adaptive Body Bias on-chip LDO"
	depends on ARCH_OMAP		depends on ARCH_OMAP

drivers/regulator/Makefile

+1 −1

drivers/regulator/st-pwm.c→drivers/regulator/pwm-regulator.c

+197 −0

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Regulator driver for ST's PWM Regulators		* Regulator driver for PWM Regulators
	*		*
	* Copyright (C) 2014 - STMicroelectronics Inc.		* Copyright (C) 2014 - STMicroelectronics Inc.
	*		*
	@@ -20,43 +20,40 @@
	#include <linux/of_device.h>		#include <linux/of_device.h>
	#include <linux/pwm.h>		#include <linux/pwm.h>

	#define ST_PWM_REG_PERIOD 8448		struct pwm_regulator_data {
			struct regulator_desc desc;
	struct st_pwm_regulator_pdata {		struct pwm_voltages *duty_cycle_table;
	const struct regulator_desc *desc;
	struct st_pwm_voltages *duty_cycle_table;
	};

	struct st_pwm_regulator_data {
	const struct st_pwm_regulator_pdata *pdata;
	struct pwm_device *pwm;		struct pwm_device *pwm;
	bool enabled;		bool enabled;
	int state;		int state;
	};		};

	struct st_pwm_voltages {		struct pwm_voltages {
	unsigned int uV;		unsigned int uV;
	unsigned int dutycycle;		unsigned int dutycycle;
	};		};

	static int st_pwm_regulator_get_voltage_sel(struct regulator_dev *dev)		static int pwm_regulator_get_voltage_sel(struct regulator_dev *dev)
	{		{
	struct st_pwm_regulator_data *drvdata = rdev_get_drvdata(dev);		struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev);

	return drvdata->state;		return drvdata->state;
	}		}

	static int st_pwm_regulator_set_voltage_sel(struct regulator_dev *dev,		static int pwm_regulator_set_voltage_sel(struct regulator_dev *dev,
	unsigned selector)		unsigned selector)
	{		{
	struct st_pwm_regulator_data *drvdata = rdev_get_drvdata(dev);		struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev);
			unsigned int pwm_reg_period;
	int dutycycle;		int dutycycle;
	int ret;		int ret;

	dutycycle = (ST_PWM_REG_PERIOD / 100) *		pwm_reg_period = pwm_get_period(drvdata->pwm);
	drvdata->pdata->duty_cycle_table[selector].dutycycle;
			dutycycle = (pwm_reg_period *
			drvdata->duty_cycle_table[selector].dutycycle) / 100;

	ret = pwm_config(drvdata->pwm, dutycycle, ST_PWM_REG_PERIOD);		ret = pwm_config(drvdata->pwm, dutycycle, pwm_reg_period);
	if (ret) {		if (ret) {
	dev_err(&dev->dev, "Failed to configure PWM\n");		dev_err(&dev->dev, "Failed to configure PWM\n");
	return ret;		return ret;
	@@ -76,61 +73,40 @@ static int st_pwm_regulator_set_voltage_sel(struct regulator_dev *dev,
	return 0;		return 0;
	}		}

	static int st_pwm_regulator_list_voltage(struct regulator_dev *dev,		static int pwm_regulator_list_voltage(struct regulator_dev *dev,
	unsigned selector)		unsigned selector)
	{		{
	struct st_pwm_regulator_data *drvdata = rdev_get_drvdata(dev);		struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev);

	if (selector >= dev->desc->n_voltages)		if (selector >= drvdata->desc.n_voltages)
	return -EINVAL;		return -EINVAL;

	return drvdata->pdata->duty_cycle_table[selector].uV;		return drvdata->duty_cycle_table[selector].uV;
	}		}

	static struct regulator_ops st_pwm_regulator_voltage_ops = {		static struct regulator_ops pwm_regulator_voltage_ops = {
	.set_voltage_sel = st_pwm_regulator_set_voltage_sel,		.set_voltage_sel = pwm_regulator_set_voltage_sel,
	.get_voltage_sel = st_pwm_regulator_get_voltage_sel,		.get_voltage_sel = pwm_regulator_get_voltage_sel,
	.list_voltage = st_pwm_regulator_list_voltage,		.list_voltage = pwm_regulator_list_voltage,
	.map_voltage = regulator_map_voltage_iterate,		.map_voltage = regulator_map_voltage_iterate,
	};		};

	static struct st_pwm_voltages b2105_duty_cycle_table[] = {		static const struct regulator_desc pwm_regulator_desc = {
	{ .uV = 1114000, .dutycycle = 0, },		.name = "pwm-regulator",
	{ .uV = 1095000, .dutycycle = 10, },		.ops = &pwm_regulator_voltage_ops,
	{ .uV = 1076000, .dutycycle = 20, },
	{ .uV = 1056000, .dutycycle = 30, },
	{ .uV = 1036000, .dutycycle = 40, },
	{ .uV = 1016000, .dutycycle = 50, },
	/* WARNING: Values above 50% duty-cycle cause boot failures. */
	};

	static const struct regulator_desc b2105_desc = {
	.name = "b2105-pwm-regulator",
	.ops = &st_pwm_regulator_voltage_ops,
	.type = REGULATOR_VOLTAGE,		.type = REGULATOR_VOLTAGE,
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.n_voltages = ARRAY_SIZE(b2105_duty_cycle_table),
	.supply_name = "pwm",		.supply_name = "pwm",
	};		};

	static const struct st_pwm_regulator_pdata b2105_info = {		static int pwm_regulator_probe(struct platform_device *pdev)
	.desc = &b2105_desc,
	.duty_cycle_table = b2105_duty_cycle_table,
	};

	static const struct of_device_id st_pwm_of_match[] = {
	{ .compatible = "st,b2105-pwm-regulator", .data = &b2105_info, },
	{ },
	};
	MODULE_DEVICE_TABLE(of, st_pwm_of_match);

	static int st_pwm_regulator_probe(struct platform_device *pdev)
	{		{
	struct st_pwm_regulator_data *drvdata;		struct pwm_regulator_data *drvdata;
			struct property *prop;
	struct regulator_dev *regulator;		struct regulator_dev *regulator;
	struct regulator_config config = { };		struct regulator_config config = { };
	struct device_node *np = pdev->dev.of_node;		struct device_node *np = pdev->dev.of_node;
	const struct of_device_id *of_match;		int length, ret;

	if (!np) {		if (!np) {
	dev_err(&pdev->dev, "Device Tree node missing\n");		dev_err(&pdev->dev, "Device Tree node missing\n");
	@@ -141,12 +117,37 @@ static int st_pwm_regulator_probe(struct platform_device *pdev)
	if (!drvdata)		if (!drvdata)
	return -ENOMEM;		return -ENOMEM;

	of_match = of_match_device(st_pwm_of_match, &pdev->dev);		memcpy(&drvdata->desc, &pwm_regulator_desc, sizeof(pwm_regulator_desc));
	if (!of_match) {
	dev_err(&pdev->dev, "failed to match of device\n");		/* determine the number of voltage-table */
	return -ENODEV;		prop = of_find_property(np, "voltage-table", &length);
			if (!prop) {
			dev_err(&pdev->dev, "No voltage-table\n");
			return -EINVAL;
			}

			if ((length < sizeof(*drvdata->duty_cycle_table)) \|\|
			(length % sizeof(*drvdata->duty_cycle_table))) {
			dev_err(&pdev->dev, "voltage-table length(%d) is invalid\n",
			length);
			return -EINVAL;
			}

			drvdata->desc.n_voltages = length / sizeof(*drvdata->duty_cycle_table);

			drvdata->duty_cycle_table = devm_kzalloc(&pdev->dev,
			length, GFP_KERNEL);
			if (!drvdata->duty_cycle_table)
			return -ENOMEM;

			/* read voltage table from DT property */
			ret = of_property_read_u32_array(np, "voltage-table",
			(u32 *)drvdata->duty_cycle_table,
			length / sizeof(u32));
			if (ret < 0) {
			dev_err(&pdev->dev, "read voltage-table failed\n");
			return ret;
	}		}
	drvdata->pdata = of_match->data;

	config.init_data = of_get_regulator_init_data(&pdev->dev, np);		config.init_data = of_get_regulator_init_data(&pdev->dev, np);
	if (!config.init_data)		if (!config.init_data)
	@@ -163,28 +164,34 @@ static int st_pwm_regulator_probe(struct platform_device *pdev)
	}		}

	regulator = devm_regulator_register(&pdev->dev,		regulator = devm_regulator_register(&pdev->dev,
	drvdata->pdata->desc, &config);		&drvdata->desc, &config);
	if (IS_ERR(regulator)) {		if (IS_ERR(regulator)) {
	dev_err(&pdev->dev, "Failed to register regulator %s\n",		dev_err(&pdev->dev, "Failed to register regulator %s\n",
	drvdata->pdata->desc->name);		drvdata->desc.name);
	return PTR_ERR(regulator);		return PTR_ERR(regulator);
	}		}

	return 0;		return 0;
	}		}

	static struct platform_driver st_pwm_regulator_driver = {		static const struct of_device_id pwm_of_match[] = {
			{ .compatible = "pwm-regulator" },
			{ },
			};
			MODULE_DEVICE_TABLE(of, pwm_of_match);

			static struct platform_driver pwm_regulator_driver = {
	.driver = {		.driver = {
	.name = "st-pwm-regulator",		.name = "pwm-regulator",
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.of_match_table = of_match_ptr(st_pwm_of_match),		.of_match_table = of_match_ptr(pwm_of_match),
	},		},
	.probe = st_pwm_regulator_probe,		.probe = pwm_regulator_probe,
	};		};

	module_platform_driver(st_pwm_regulator_driver);		module_platform_driver(pwm_regulator_driver);

	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");
	MODULE_AUTHOR("Lee Jones <lee.jones@linaro.org>");		MODULE_AUTHOR("Lee Jones <lee.jones@linaro.org>");
	MODULE_DESCRIPTION("ST PWM Regulator Driver");		MODULE_DESCRIPTION("PWM Regulator Driver");
	MODULE_ALIAS("platform:st_pwm-regulator");		MODULE_ALIAS("platform:pwm-regulator");

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,7 @@ obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
	obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o		obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o
	obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o		obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
	obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o		obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
			obj-$(CONFIG_REGULATOR_PWM) += pwm-regulator.o
	obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o		obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
	obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o		obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o
	obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o		obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
	@@ -65,7 +66,6 @@ obj-$(CONFIG_REGULATOR_RC5T583) += rc5t583-regulator.o
	obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o		obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o
	obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o		obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
	obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o		obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
	obj-$(CONFIG_REGULATOR_ST_PWM) += st-pwm.o
	obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o		obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o
	obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o		obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o
	obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o		obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o