Merge tag 'regulator-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

TPS6507x Power Management Integrated Circuit

Required properties:

- compatible: "ti,tps6507x"

- reg: I2C slave address

- regulators: This is the list of child nodes that specify the regulator

  initialization data for defined regulators. Not all regulators for the

  given device need to be present. The definition for each of these nodes

  is defined using the standard binding for regulators found at

  Documentation/devicetree/bindings/regulator/regulator.txt.

  The regulator is matched with the regulator-compatible.

  The valid regulator-compatible values are:

  tps6507x: vdcdc1, vdcdc2, vdcdc3, vldo1, vldo2

- xxx-supply: Input voltage supply regulator.

  These entries are required if regulators are enabled for a device.

  Missing of these properties can cause the regulator registration

  fails.

  If some of input supply is powered through battery or always-on

  supply then also it is require to have these parameters with proper

  node handle of always on power supply.

  tps6507x:

       vindcdc1_2-supply: VDCDC1 and VDCDC2 input.

       vindcdc3-supply  : VDCDC3 input.

       vldo1_2-supply   : VLDO1 and VLDO2 input.

Regulator Optional properties:

- defdcdc_default: It's property of DCDC2 and DCDC3 regulators.

			0: If defdcdc pin of DCDC2/DCDC3 is pulled to GND.

			1: If defdcdc pin of DCDC2/DCDC3 is driven HIGH.

  If this property is not defined, it defaults to 0 (not enabled).

Example:

	pmu: tps6507x@48 {

		compatible = "ti,tps6507x";

		reg = <0x48>;

		vindcdc1_2-supply = <&vbat>;

		vindcdc3-supply = <...>;

		vinldo1_2-supply = <...>;

		regulators {

			#address-cells = <1>;

			#size-cells = <0>;

			vdcdc1_reg: regulator@0 {

				regulator-compatible = "VDCDC1";

				reg = <0>;

				regulator-min-microvolt = <3150000>;

				regulator-max-microvolt = <3450000>;

				regulator-always-on;

				regulator-boot-on;

			};

			vdcdc2_reg: regulator@1 {

				regulator-compatible = "VDCDC2";

				reg = <1>;

				regulator-min-microvolt = <1710000>;

				regulator-max-microvolt = <3450000>;

				regulator-always-on;

				regulator-boot-on;

				defdcdc_default = <1>;

			};

			vdcdc3_reg: regulator@2 {

				regulator-compatible = "VDCDC3";

				reg = <2>;

				regulator-min-microvolt = <950000>

				regulator-max-microvolt = <1350000>;

				regulator-always-on;

				regulator-boot-on;

				defdcdc_default = <1>;

			};

			ldo1_reg: regulator@3 {

				regulator-compatible = "LDO1";

				reg = <3>;

				regulator-min-microvolt = <1710000>;

				regulator-max-microvolt = <1890000>;

				regulator-always-on;

				regulator-boot-on;

			};

			ldo2_reg: regulator@4 {

				regulator-compatible = "LDO2";

				reg = <4>;

				regulator-min-microvolt = <1140000>;

				regulator-max-microvolt = <1320000>;

				regulator-always-on;

				regulator-boot-on;

			};

		};

	};

- anatop-min-voltage: Minimum voltage of this regulator

- anatop-max-voltage: Maximum voltage of this regulator

Optional properties:

- anatop-delay-reg-offset: Anatop MFD step time register offset

- anatop-delay-bit-shift: Bit shift for the step time register

- anatop-delay-bit-width: Number of bits used in the step time register

Any property defined as part of the core regulator

binding, defined in regulator.txt, can also be used.

		anatop-reg-offset = <0x140>;

		anatop-vol-bit-shift = <9>;

		anatop-vol-bit-width = <5>;

		anatop-delay-reg-offset = <0x170>;

		anatop-delay-bit-shift = <24>;

		anatop-delay-bit-width = <2>;

		anatop-min-bit-val = <1>;

		anatop-min-voltage = <725000>;

		anatop-max-voltage = <1300000>;

* Samsung S5M8767 Voltage and Current Regulator

The Samsung S5M8767 is a multi-function device which includes volatage and

current regulators, rtc, charger controller and other sub-blocks. It is

interfaced to the host controller using a i2c interface. Each sub-block is

addressed by the host system using different i2c slave address. This document

describes the bindings for 'pmic' sub-block of s5m8767.

Required properties:

- compatible: Should be "samsung,s5m8767-pmic".

- reg: Specifies the i2c slave address of the pmic block. It should be 0x66.

- s5m8767,pmic-buck2-dvs-voltage: A set of 8 voltage values in micro-volt (uV)

  units for buck2 when changing voltage using gpio dvs. Refer to [1] below

  for additional information.

- s5m8767,pmic-buck3-dvs-voltage: A set of 8 voltage values in micro-volt (uV)

  units for buck3 when changing voltage using gpio dvs. Refer to [1] below

  for additional information.

- s5m8767,pmic-buck4-dvs-voltage: A set of 8 voltage values in micro-volt (uV)

  units for buck4 when changing voltage using gpio dvs. Refer to [1] below

  for additional information.

- s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used

  for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines.

[1] If none of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional

    property is specified, the 's5m8767,pmic-buck[2/3/4]-dvs-voltage'

    property should specify atleast one voltage level (which would be a

    safe operating voltage).

    If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional

    property is specified, then all the eight voltage values for the

    's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified.

Optional properties:

- interrupt-parent: Specifies the phandle of the interrupt controller to which

  the interrupts from s5m8767 are delivered to.

- interrupts: Interrupt specifiers for two interrupt sources.

  - First interrupt specifier is for 'irq1' interrupt.

  - Second interrupt specifier is for 'alert' interrupt.

- s5m8767,pmic-buck2-uses-gpio-dvs: 'buck2' can be controlled by gpio dvs.

- s5m8767,pmic-buck3-uses-gpio-dvs: 'buck3' can be controlled by gpio dvs.

- s5m8767,pmic-buck4-uses-gpio-dvs: 'buck4' can be controlled by gpio dvs.

Additional properties required if either of the optional properties are used:

- s5m8767,pmic-buck234-default-dvs-idx: Default voltage setting selected from

  the possible 8 options selectable by the dvs gpios. The value of this

  property should be between 0 and 7. If not specified or if out of range, the

  default value of this property is set to 0.

- s5m8767,pmic-buck-dvs-gpios: GPIO specifiers for three host gpio's used

  for dvs. The format of the gpio specifier depends in the gpio controller.

Regulators: The regulators of s5m8767 that have to be instantiated should be

included in a sub-node named 'regulators'. Regulator nodes included in this

sub-node should be of the format as listed below.

	regulator_name {

		ldo1_reg: LDO1 {

			regulator-name = "VDD_ALIVE_1.0V";

			regulator-min-microvolt = <1100000>;

			regulator-max-microvolt = <1100000>;

			regulator-always-on;

			regulator-boot-on;

			op_mode = <1>; /* Normal Mode */

		};

	};

The above regulator entries are defined in regulator bindings documentation

except op_mode description.

	- op_mode: describes the different operating modes of the LDO's with

		power mode change in SOC. The different possible values are,

		0 - always off mode

		1 - on in normal mode

		2 - low power mode

		3 - suspend mode

The following are the names of the regulators that the s5m8767 pmic block

supports. Note: The 'n' in LDOn and BUCKn represents the LDO or BUCK number

as per the datasheet of s5m8767.

	- LDOn

		  - valid values for n are 1 to 28

		  - Example: LDO0, LD01, LDO28

	- BUCKn

		  - valid values for n are 1 to 9.

		  - Example: BUCK1, BUCK2, BUCK9

The bindings inside the regulator nodes use the standard regulator bindings

which are documented elsewhere.

Example:

	s5m8767_pmic@66 {

		compatible = "samsung,s5m8767-pmic";

		reg = <0x66>;

		s5m8767,pmic-buck2-uses-gpio-dvs;

		s5m8767,pmic-buck3-uses-gpio-dvs;

		s5m8767,pmic-buck4-uses-gpio-dvs;

		s5m8767,pmic-buck-default-dvs-idx = <0>;

		s5m8767,pmic-buck-dvs-gpios = <&gpx0 0 1 0 0>, /* DVS1 */

						 <&gpx0 1 1 0 0>, /* DVS2 */

						 <&gpx0 2 1 0 0>; /* DVS3 */

		s5m8767,pmic-buck-ds-gpios = <&gpx2 3 1 0 0>, /* SET1 */

						<&gpx2 4 1 0 0>, /* SET2 */

						<&gpx2 5 1 0 0>; /* SET3 */

		s5m8767,pmic-buck2-dvs-voltage = <1350000>, <1300000>,

						 <1250000>, <1200000>,

						 <1150000>, <1100000>,

						 <1000000>, <950000>;

		s5m8767,pmic-buck3-dvs-voltage = <1100000>, <1100000>,

						 <1100000>, <1100000>,

						 <1000000>, <1000000>,

						 <1000000>, <1000000>;

		s5m8767,pmic-buck4-dvs-voltage = <1200000>, <1200000>,

						 <1200000>, <1200000>,

						 <1200000>, <1200000>,

						 <1200000>, <1200000>;

		regulators {

			ldo1_reg: LDO1 {

				regulator-name = "VDD_ABB_3.3V";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				op_mode = <1>; /* Normal Mode */

			};

			ldo2_reg: LDO2 {

				regulator-name = "VDD_ALIVE_1.1V";

				regulator-min-microvolt = <1100000>;

				regulator-max-microvolt = <1100000>;

				regulator-always-on;

			};

			buck1_reg: BUCK1 {

				regulator-name = "VDD_MIF_1.2V";

				regulator-min-microvolt = <950000>;

				regulator-max-microvolt = <1350000>;

				regulator-always-on;

				regulator-boot-on;

			};

		};

	};

TPS51632 Voltage regulators

Required properties:

- compatible: Must be "ti,tps51632"

- reg: I2C slave address

Optional properties:

- ti,enable-pwm-dvfs: Enable the DVFS voltage control through the PWM interface.

- ti,dvfs-step-20mV: The 20mV step voltage when PWM DVFS enabled. Missing this

	will set 10mV step voltage in PWM DVFS mode. In normal mode, the voltage

	step is 10mV as per datasheet.

Any property defined as part of the core regulator binding, defined in

regulator.txt, can also be used.

Example:

	tps51632 {

		compatible = "ti,tps51632";

		reg =  <0x43>;

		regulator-name = "tps51632-vout";

		regulator-min-microvolt = <500000>;

		regulator-max-microvolt = <1500000>;

		regulator-boot-on;

		ti,enable-pwm-dvfs;

		ti,dvfs-step-20mV;

	};

#include <linux/err.h>

#include <linux/slab.h>

#include <linux/i2c.h>

#include <linux/of_irq.h>

#include <linux/interrupt.h>

#include <linux/pm_runtime.h>

#include <linux/mutex.h>

	},

};

#ifdef CONFIG_OF

static struct of_device_id sec_dt_match[] = {

	{	.compatible = "samsung,s5m8767-pmic",

		.data = (void *)S5M8767X,

	},

	{},

};

#endif

int sec_reg_read(struct sec_pmic_dev *sec_pmic, u8 reg, void *dest)

{

	return regmap_read(sec_pmic->regmap, reg, dest);

	.val_bits = 8,

};

#ifdef CONFIG_OF

/*

 * Only the common platform data elements for s5m8767 are parsed here from the

 * device tree. Other sub-modules of s5m8767 such as pmic, rtc , charger and

 * others have to parse their own platform data elements from device tree.

 *

 * The s5m8767 platform data structure is instantiated here and the drivers for

 * the sub-modules need not instantiate another instance while parsing their

 * platform data.

 */

static struct sec_platform_data *sec_pmic_i2c_parse_dt_pdata(

					struct device *dev)

{

	struct sec_platform_data *pd;

	pd = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL);

	if (!pd) {

		dev_err(dev, "could not allocate memory for pdata\n");

		return ERR_PTR(-ENOMEM);

	}

	/*

	 * ToDo: the 'wakeup' member in the platform data is more of a linux

	 * specfic information. Hence, there is no binding for that yet and

	 * not parsed here.

	 */

	return pd;

}

#else

static struct sec_platform_data *sec_pmic_i2c_parse_dt_pdata(

					struct device *dev)

{

	return 0;

}

#endif

static inline int sec_i2c_get_driver_data(struct i2c_client *i2c,

						const struct i2c_device_id *id)

{

#ifdef CONFIG_OF

	if (i2c->dev.of_node) {

		const struct of_device_id *match;

		match = of_match_node(sec_dt_match, i2c->dev.of_node);

		return (int)match->data;

	}

#endif

	return (int)id->driver_data;

}

static int sec_pmic_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

{

	sec_pmic->dev = &i2c->dev;

	sec_pmic->i2c = i2c;

	sec_pmic->irq = i2c->irq;

	sec_pmic->type = id->driver_data;

	sec_pmic->type = sec_i2c_get_driver_data(i2c, id);

	if (sec_pmic->dev->of_node) {

		pdata = sec_pmic_i2c_parse_dt_pdata(sec_pmic->dev);

		if (IS_ERR(pdata)) {

			ret = PTR_ERR(pdata);

			return ret;

		}

		pdata->device_type = sec_pmic->type;

	}

	if (pdata) {

		sec_pmic->device_type = pdata->device_type;

		sec_pmic->ono = pdata->ono;

		sec_pmic->irq_base = pdata->irq_base;

		sec_pmic->wakeup = pdata->wakeup;

		sec_pmic->pdata = pdata;

	}

	sec_pmic->regmap = devm_regmap_init_i2c(i2c, &sec_regmap_config);

	.driver = {

		   .name = "sec_pmic",

		   .owner = THIS_MODULE,

		   .of_match_table = of_match_ptr(sec_dt_match),

	},

	.probe = sec_pmic_probe,

	.remove = sec_pmic_remove,