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

Commit 828fa1e6 authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

Merge tag 'mfd-lee-3.12-1' of git://git.linaro.org/people/ljones/mfd 



Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parents 09fd8678 8a105ca2

Documentation/devicetree/bindings/mfd/s2mps11.txt

+20 −0
Original line number Diff line number Diff line
@@ -16,6 +16,21 @@ Optional properties: 
- interrupts: Interrupt specifiers for interrupt sources.



Optional nodes:

- clocks: s2mps11 provides three(AP/CP/BT) buffered 32.768 KHz outputs, so to

  register these as clocks with common clock framework instantiate a sub-node

  named "clocks". It uses the common clock binding documented in :

  [Documentation/devicetree/bindings/clock/clock-bindings.txt]

  - #clock-cells: should be 1.



  - The following is the list of clocks generated by the controller. Each clock

    is assigned an identifier and client nodes use this identifier to specify

    the clock which they consume.

    Clock               ID

    ----------------------

    32KhzAP		0

    32KhzCP		1

    32KhzBT		2



- regulators: The regulators of s2mps11 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.
@@ -55,6 +70,11 @@ Example: 
		compatible = "samsung,s2mps11-pmic";

		reg = <0x66>;



		s2m_osc: clocks{

			#clock-cells = 1;

			clock-output-names = "xx", "yy", "zz";

		};



		regulators {

			ldo1_reg: LDO1 {

				regulator-name = "VDD_ABB_3.3V";

Documentation/devicetree/bindings/regulator/palmas-pmic.txt

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ Optional nodes: 
	       ti,smps-range - OTP has the wrong range set for the hardware so override

	       0 - low range, 1 - high range.



- ti,system-power-controller: Telling whether or not this pmic is controlling

			      the system power.



Example:



#include <dt-bindings/interrupt-controller/irq.h>
@@ -49,6 +52,8 @@ pmic { 


	ti,ldo6-vibrator;



	ti,system-power-controller;



	regulators {

		smps12_reg : smps12 {

			regulator-name = "smps12";

drivers/mfd/88pm800.c

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ static int pm800_probe(struct i2c_client *client, 
{

	int ret = 0;

	struct pm80x_chip *chip;

	struct pm80x_platform_data *pdata = client->dev.platform_data;

	struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev);

	struct pm80x_subchip *subchip;



	ret = pm80x_init(client);

drivers/mfd/88pm805.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static int pm805_probe(struct i2c_client *client, 
{

	int ret = 0;

	struct pm80x_chip *chip;

	struct pm80x_platform_data *pdata = client->dev.platform_data;

	struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev);



	ret = pm80x_init(client);

	if (ret) {

drivers/mfd/88pm860x-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ static int pm860x_dt_init(struct device_node *np, 
static int pm860x_probe(struct i2c_client *client,

				  const struct i2c_device_id *id)

{

	struct pm860x_platform_data *pdata = client->dev.platform_data;

	struct pm860x_platform_data *pdata = dev_get_platdata(&client->dev);

	struct device_node *node = client->dev.of_node;

	struct pm860x_chip *chip;

	int ret;