Commit 5fea0902 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/act8865',... 

Merge remote-tracking branches 'regulator/topic/act8865', 'regulator/topic/can-change-voltage', 'regulator/topic/da9210' and 'regulator/topic/da9211' into regulator-next
parents 38cdaddf 842a8824 fc1e1c4a 2d0cf04c 7524c1ce

Documentation/devicetree/bindings/regulator/da9210.txt

+8 −4
Original line number Diff line number Diff line 
* Dialog Semiconductor DA9210 Voltage Regulator

* Dialog Semiconductor DA9210 Multi-phase 12A DCDC BUCK Converter



Required properties:
@@ -18,8 +18,12 @@ Example: 
		compatible = "dlg,da9210";

		reg = <0x68>;



		regulator-min-microvolt = <900000>;

		regulator-max-microvolt = <1000000>;

		interrupt-parent = <...>;

		interrupts = <...>;



		regulator-min-microvolt = <300000>;

		regulator-max-microvolt = <1570000>;

		regulator-min-microamp = <1600000>;

		regulator-max-microamp = <4600000>;

		regulator-boot-on;

		regulator-always-on;

	};

Documentation/devicetree/bindings/regulator/da9211.txt

+42 −5
Original line number Diff line number Diff line 
* Dialog Semiconductor DA9211/DA9213/DA9215 Voltage Regulator

* Dialog Semiconductor DA9211/DA9212/DA9213/DA9214/DA9215 Voltage Regulator



Required properties:

- compatible: "dlg,da9211" or "dlg,da9213" or "dlg,da9215"

- compatible: "dlg,da9211" or "dlg,da9212" or "dlg,da9213"

  or "dlg,da9214" or "dlg,da9215"

- reg: I2C slave address, usually 0x68.

- interrupts: the interrupt outputs of the controller

- regulators: A node that houses a sub-node for each regulator within the
@@ -21,6 +22,25 @@ Example 1) DA9211 
		reg = <0x68>;

		interrupts = <3 27>;



		regulators {

			BUCKA {

				regulator-name = "VBUCKA";

				regulator-min-microvolt = < 300000>;

				regulator-max-microvolt = <1570000>;

				regulator-min-microamp 	= <2000000>;

				regulator-max-microamp 	= <5000000>;

				enable-gpios = <&gpio 27 0>;

			};

		};

	};



Example 2) DA9212



	pmic: da9212@68 {

		compatible = "dlg,da9212";

		reg = <0x68>;

		interrupts = <3 27>;



		regulators {

			BUCKA {

				regulator-name = "VBUCKA";
@@ -41,12 +61,30 @@ Example 1) DA9211 
		};

	};



Example 2) DA9213

Example 3) DA9213

	pmic: da9213@68 {

		compatible = "dlg,da9213";

		reg = <0x68>;

		interrupts = <3 27>;



		regulators {

			BUCKA {

				regulator-name = "VBUCKA";

				regulator-min-microvolt = < 300000>;

				regulator-max-microvolt = <1570000>;

				regulator-min-microamp 	= <3000000>;

				regulator-max-microamp 	= <6000000>;

				enable-gpios = <&gpio 27 0>;

			};

		};

	};



Example 4) DA9214

	pmic: da9214@68 {

		compatible = "dlg,da9214";

		reg = <0x68>;

		interrupts = <3 27>;



		regulators {

			BUCKA {

				regulator-name = "VBUCKA";
@@ -67,8 +105,7 @@ Example 2) DA9213 
		};

	};





Example 3) DA9215

Example 5) DA9215

	pmic: da9215@68 {

		compatible = "dlg,da9215";

		reg = <0x68>;

drivers/regulator/act8865-regulator.c

+6 −6
Original line number Diff line number Diff line
@@ -395,12 +395,6 @@ static int act8865_pdata_from_dt(struct device *dev, 
	struct act8865_regulator_data *regulator;

	struct of_regulator_match *matches;



	np = of_get_child_by_name(dev->of_node, "regulators");

	if (!np) {

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

		return -EINVAL;

	}



	switch (type) {

	case ACT8600:

		matches = act8600_matches;
@@ -419,6 +413,12 @@ static int act8865_pdata_from_dt(struct device *dev, 
		return -EINVAL;

	}



	np = of_get_child_by_name(dev->of_node, "regulators");

	if (!np) {

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

		return -EINVAL;

	}



	matched = of_regulator_match(dev, np, matches, num_matches);

	of_node_put(np);

	if (matched <= 0)

drivers/regulator/core.c

+0 −27
Original line number Diff line number Diff line
@@ -2508,33 +2508,6 @@ int regulator_is_enabled(struct regulator *regulator) 
}

EXPORT_SYMBOL_GPL(regulator_is_enabled);



/**

 * regulator_can_change_voltage - check if regulator can change voltage

 * @regulator: regulator source

 *

 * Returns positive if the regulator driver backing the source/client

 * can change its voltage, false otherwise. Useful for detecting fixed

 * or dummy regulators and disabling voltage change logic in the client

 * driver.

 */

int regulator_can_change_voltage(struct regulator *regulator)

{

	struct regulator_dev	*rdev = regulator->rdev;



	if (regulator_ops_is_valid(rdev, REGULATOR_CHANGE_VOLTAGE)) {

		if (rdev->desc->n_voltages - rdev->desc->linear_min_sel > 1)

			return 1;



		if (rdev->desc->continuous_voltage_range &&

		    rdev->constraints->min_uV && rdev->constraints->max_uV &&

		    rdev->constraints->min_uV != rdev->constraints->max_uV)

			return 1;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(regulator_can_change_voltage);



/**

 * regulator_count_voltages - count regulator_list_voltage() selectors

 * @regulator: regulator source

drivers/regulator/da9210-regulator.c

+19 −2
Original line number Diff line number Diff line
@@ -21,12 +21,11 @@ 
#include <linux/err.h>

#include <linux/i2c.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/irq.h>

#include <linux/slab.h>

#include <linux/regulator/driver.h>

#include <linux/regulator/machine.h>

#include <linux/of_device.h>

#include <linux/regulator/of_regulator.h>

#include <linux/regmap.h>
@@ -179,6 +178,13 @@ static irqreturn_t da9210_irq_handler(int irq, void *data) 
/*

 * I2C driver interface functions

 */



static const struct of_device_id da9210_dt_ids[] = {

	{ .compatible = "dlg,da9210", },

	{ }

};

MODULE_DEVICE_TABLE(of, da9210_dt_ids);



static int da9210_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

{
@@ -188,6 +194,16 @@ static int da9210_i2c_probe(struct i2c_client *i2c, 
	struct regulator_dev *rdev = NULL;

	struct regulator_config config = { };

	int error;

	const struct of_device_id *match;



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

		match = of_match_device(of_match_ptr(da9210_dt_ids),

						&i2c->dev);

		if (!match) {

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

			return -ENODEV;

		}

	}



	chip = devm_kzalloc(&i2c->dev, sizeof(struct da9210), GFP_KERNEL);

	if (!chip)
@@ -264,6 +280,7 @@ MODULE_DEVICE_TABLE(i2c, da9210_i2c_id); 
static struct i2c_driver da9210_regulator_driver = {

	.driver = {

		.name = "da9210",

		.of_match_table = of_match_ptr(da9210_dt_ids),

	},

	.probe = da9210_i2c_probe,

	.id_table = da9210_i2c_id,