Merge tag 'mfd-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next

twl6037 (palmas)

tps65913 (palmas)

tps65914 (palmas)

tps659038

Required properties:

- compatible : Should be from the list

  ti,tps65913

  ti,tps65914

  ti,tps80036

  ti,tps659038

and also the generic series names

  ti,palmas

- interrupt-controller : palmas has its own internal IRQs

* Samsung S2MPS11 Voltage and Current Regulator

The Samsung S2MP211 is a multi-function device which includes voltage 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.

Required properties:

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

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

Optional properties:

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

  the interrupts from s2mps11 are delivered to.

- 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.

	regulator_name {

		[standard regulator constraints....];

	};

 regulator-ramp-delay for BUCKs = [6250/12500/25000(default)/50000] uV/us

 BUCK[2/3/4/6] supports disabling ramp delay on hardware, so explictly

 regulator-ramp-delay = <0> can be used for them to disable ramp delay.

 In absence of regulator-ramp-delay property, default ramp delay will be used.

NOTE: Some BUCKs share the ramp rate setting i.e. same ramp value will be set

for a particular group of BUCKs. So provide same regulator-ramp-delay<value>.

Grouping of BUCKs sharing ramp rate setting is as follow : BUCK[1, 6],

BUCK[3, 4], and BUCK[7, 8, 10]

The regulator constraints inside the regulator nodes use the standard regulator

bindings which are documented elsewhere.

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

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

as per the datasheet of s2mps11.

	- 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

Example:

	s2mps11_pmic@66 {

		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";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

			};

			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";

				regulator-min-microvolt = <950000>;

				regulator-max-microvolt = <1350000>;

				regulator-always-on;

				regulator-boot-on;

			};

			buck2_reg: BUCK2 {

				regulator-name = "vdd_arm";

				regulator-min-microvolt = <950000>;

				regulator-max-microvolt = <1350000>;

				regulator-always-on;

				regulator-boot-on;

				regulator-ramp-delay = <50000>;

			};

		};

	};

	       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>

	ti,ldo6-vibrator;

	ti,system-power-controller;

	regulators {

		smps12_reg : smps12 {

			regulator-name = "smps12";

/* Realtek PCI-Express Memstick Card Interface driver

 *

 * Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.

 * Copyright(c) 2009-2013 Realtek Semiconductor Corp. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the

 *

 * Author:

 *   Wei WANG <wei_wang@realsil.com.cn>

 *   No. 450, Shenhu Road, Suzhou Industry Park, Suzhou, China

 */

#include <linux/module.h>

{

	int ret;

	if (pdata) {

		rtc_devs[0].platform_data = pdata->rtc;

		rtc_devs[0].pdata_size =

				pdata->rtc ? sizeof(struct pm80x_rtc_pdata) : 0;

	}

	ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],

			      ARRAY_SIZE(rtc_devs), NULL, 0, NULL);

	if (ret) {

{

	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);

		goto err_device_init;

	}

	if (pdata->plat_config)

	if (pdata && pdata->plat_config)

		pdata->plat_config(chip, pdata);

	return 0;