Merge tag 'mfd-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull MFD updates from Lee Jones:
 "Changes to existing drivers:

   - Rename child driver [axp288_battery => axp288_fuel_gauge]; axp20x
   - Rename child driver [max77693-flash => max77693-led]; max77693
   - Error handling fixes; intel_soc_pmic
   - GPIO tweaking; intel_soc_pmic
   - Remove non-DT code; vexpress-sysreg, tc3589x
   - Remove unused/legacy code; ti_am335x_tscadc, rts5249, rtsx_gops, rtsx_pcr,
                                rtc-s5m, sec-core, max77693, menelaus,
                                wm5102-tables
   - Trivial fixups; rtsx_pci, da9150-core, sec-core, max7769, max77693,
                     mc13xxx-core, dln2, hi6421-pmic-core, rk808, twl4030-power,
                     lpc_ich, menelaus, twl6040
   - Update register/address values; rts5227, rts5249
   - DT and/or binding document fixups; arizona, da9150, mt6397, axp20x,
                                        qcom-rpm, qcom-spmi-pmic
   - Couple of trivial core Kconfig fixups
   - Remove use of seq_printf return value; ab8500-debugfs
   - Remove __exit markups; menelaus, tps65010
   - Fix platform-device name collisions; mfd-core

  New drivers/supported devices:

   - Add support for wm8280/wm8281 into arizona
   - Add support for COMe-cBL6 into kempld-core
   - Add support for rts524a and rts525a into rts5249
   - Add support for ipq8064 into qcom_rpm
   - Add support for extcon into axp20x
   - New MediaTek MT6397 PMIC driver
   - New Maxim MAX77843 PMIC dirver
   - New Intel Quark X1000 I2C-GPIO driver
   - New Skyworks SKY81452 driver"

* tag 'mfd-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (76 commits)
  mfd: sec: Fix RTC alarm interrupt number on S2MPS11
  mfd: wm5102: Remove registers for output 3R from readable list
  mfd: tps65010: Remove incorrect __exit markups
  mfd: devicetree: bindings: Add Qualcomm RPM regulator subnodes
  mfd: axp20x: Add support for extcon cell
  mfd: lpc_ich: Sort IDs
  mfd: twl6040: Remove wrong and unneeded "platform:twl6040" modalias
  mfd: qcom-spmi-pmic: Add specific compatible strings for Qualcomm's SPMI PMIC's
  mfd: axp20x: Fix duplicate const for model names
  mfd: menelaus: Use macro for magic number
  mfd: menelaus: Drop support for SW controller VCORE
  mfd: menelaus: Delete omap_has_menelaus
  mfd: arizona: Correct type of gpio_defaults
  mfd: lpc_ich: Sort IDs
  mfd: Fix a typo in Kconfig
  mfd: qcom_rpm: Add support for IPQ8064
  mfd: devicetree: qcom_rpm: Document IPQ8064 resources
  mfd: core: Fix platform-device name collisions
  mfd: intel_quark_i2c_gpio: Don't crash if !DMI
  dt-bindings: Add vendor-prefix for X-Powers
  ...

10 files changed, 524 insertions, 30 deletions

diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index aaa8325004d2..003bd77b4595 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -89,6 +89,7 @@ ricoh,rv5c386		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
 ricoh,rv5c387a          I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC
 samsung,24ad0xd1        S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)
 sii,s35390a             2-wire CMOS real-time clock
+skyworks,sky81452       Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply
 st-micro,24c256         i2c serial eeprom  (24cxx)
 stm,m41t00              Serial Access TIMEKEEPER
 stm,m41t62              Serial real-time clock (RTC) with alarm
diff --git a/Documentation/devicetree/bindings/mfd/arizona.txt b/Documentation/devicetree/bindings/mfd/arizona.txt
index 7bd1273f571a..7665aa95979f 100644
--- a/Documentation/devicetree/bindings/mfd/arizona.txt
+++ b/Documentation/devicetree/bindings/mfd/arizona.txt
@@ -8,6 +8,7 @@ Required properties:
   - compatible : One of the following chip-specific strings:
         "wlf,wm5102"
         "wlf,wm5110"
+        "wlf,wm8280"
         "wlf,wm8997"
   - reg : I2C slave address when connected using I2C, chip select number when
     using SPI.
@@ -26,21 +27,27 @@ Required properties:
   - #gpio-cells : Must be 2. The first cell is the pin number and the
     second cell is used to specify optional parameters (currently unused).
 
-  - AVDD-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply (wm5102, wm5110),
-    CPVDD-supply, SPKVDDL-supply (wm5102, wm5110), SPKVDDR-supply (wm5102,
-    wm5110), SPKVDD-supply (wm8997) : Power supplies for the device, as covered
-    in Documentation/devicetree/bindings/regulator/regulator.txt
+  - AVDD-supply, DBVDD1-supply, CPVDD-supply : Power supplies for the device,
+    as covered in Documentation/devicetree/bindings/regulator/regulator.txt
+
+  - DBVDD2-supply, DBVDD3-supply : Additional databus power supplies (wm5102,
+    wm5110, wm8280)
+
+  - SPKVDDL-supply, SPKVDDR-supply : Speaker driver power supplies (wm5102,
+    wm5110, wm8280)
+
+  - SPKVDD-supply : Speaker driver power supply (wm8997)
 
 Optional properties:
 
   - wlf,reset : GPIO specifier for the GPIO controlling /RESET
   - wlf,ldoena : GPIO specifier for the GPIO controlling LDOENA
 
-  - wlf,gpio-defaults : A list of GPIO configuration register values. If
-    absent, no configuration of these registers is performed. If any
-    entry has a value that is out of range for a 16 bit register then
-    the chip default will be used.  If present exactly five values must
-    be specified.
+  - wlf,gpio-defaults : A list of GPIO configuration register values. Defines
+    for the appropriate values can found in <dt-bindings/mfd/arizona.txt>. If
+    absent, no configuration of these registers is performed. If any entry has
+    a value that is out of range for a 16 bit register then the chip default
+    will be used. If present exactly five values must be specified.
 
   - wlf,inmode : A list of INn_MODE register values, where n is the number
     of input signals. Valid values are 0 (Differential), 1 (Single-ended) and
@@ -49,6 +56,12 @@ Optional properties:
     input singals. If values less than the number of input signals, elements
     that has not been specifed are set to 0 by default.
 
+  - wlf,dmic-ref : DMIC reference voltage source for each input, can be
+    selected from either MICVDD or one of the MICBIAS's, defines
+    (ARIZONA_DMIC_xxxx) are provided in <dt-bindings/mfd/arizona.txt>. If
+    present, the number of values should be less than or equal to the
+    number of inputs, unspecified inputs will use the chip default.
+
   - DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if
     they are being externally supplied. As covered in
     Documentation/devicetree/bindings/regulator/regulator.txt
@@ -73,10 +86,10 @@ codec: wm5102@1a {
         #gpio-cells = <2>;
 
         wlf,gpio-defaults = <
-                0x00000000 /* AIF1TXLRCLK */
-                0xffffffff
-                0xffffffff
-                0xffffffff
-                0xffffffff
+                ARIZONA_GP_FN_TXLRCLK
+                ARIZONA_GP_DEFAULT
+                ARIZONA_GP_DEFAULT
+                ARIZONA_GP_DEFAULT
+                ARIZONA_GP_DEFAULT
         >;
 };
diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
new file mode 100644
index 000000000000..98685f291a72
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
@@ -0,0 +1,96 @@
+AXP202/AXP209 device tree bindings
+
+The axp20x family current members :
+axp202 (X-Powers)
+axp209 (X-Powers)
+
+Required properties:
+- compatible: "x-powers,axp202" or "x-powers,axp209"
+- reg: The I2C slave address for the AXP chip
+- interrupt-parent: The parent interrupt controller
+- interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
+- interrupt-controller: axp20x has its own internal IRQs
+- #interrupt-cells: Should be set to 1
+
+Optional properties:
+- x-powers,dcdc-freq: defines the work frequency of DC-DC in KHz
+                      (range: 750-1875). Default: 1.5MHz
+- <input>-supply: a phandle to the regulator supply node. May be omitted if
+                  inputs are unregulated, such as using the IPSOUT output
+                  from the PMIC.
+
+- regulators: A node that houses a sub-node for each regulator. Regulators
+              not used but preferred to be managed by the OS should be
+              listed as well.
+              See Documentation/devicetree/bindings/regulator/regulator.txt
+              for more information on standard regulator bindings.
+
+Optional properties for DCDC regulators:
+- x-powers,dcdc-workmode: 1 for PWM mode, 0 for AUTO (PWM/PFM) mode
+                          Default: Current hardware setting
+                          The DCDC regulators work in a mixed PWM/PFM mode,
+                          using PFM under light loads and switching to PWM
+                          for heavier loads. Forcing PWM mode trades efficiency
+                          under light loads for lower output noise. This
+                          probably makes sense for HiFi audio related
+                          applications that aren't battery constrained.
+
+
+AXP202/AXP209 regulators, type, and corresponding input supply names:
+
+Regulator         Type            Supply Name             Notes
+---------         ----            -----------             -----
+DCDC2           : DC-DC buck    : vin2-supply
+DCDC3           : DC-DC buck    : vin3-supply
+LDO1            : LDO           : acin-supply           : always on
+LDO2            : LDO           : ldo24in-supply        : shared supply
+LDO3            : LDO           : ldo3in-supply
+LDO4            : LDO           : ldo24in-supply        : shared supply
+LDO5            : LDO           : ldo5in-supply
+
+Example:
+
+axp209: pmic@34 {
+        compatible = "x-powers,axp209";
+        reg = <0x34>;
+        interrupt-parent = <&nmi_intc>;
+        interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+        interrupt-controller;
+        #interrupt-cells = <1>;
+
+        regulators {
+                x-powers,dcdc-freq = <1500>;
+
+                vdd_cpu: dcdc2 {
+                        regulator-always-on;
+                        regulator-min-microvolt = <1000000>;
+                        regulator-max-microvolt = <1450000>;
+                        regulator-name = "vdd-cpu";
+                };
+
+                vdd_int_dll: dcdc3 {
+                        regulator-always-on;
+                        regulator-min-microvolt = <1000000>;
+                        regulator-max-microvolt = <1400000>;
+                        regulator-name = "vdd-int-dll";
+                };
+
+                vdd_rtc: ldo1 {
+                        regulator-always-on;
+                        regulator-min-microvolt = <1200000>;
+                        regulator-max-microvolt = <1400000>;
+                        regulator-name = "vdd-rtc";
+                };
+
+                avcc: ldo2 {
+                        regulator-always-on;
+                        regulator-min-microvolt = <2700000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-name = "avcc";
+                };
+
+                ldo3 {
+                        /* unused but preferred to be managed by OS */
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/mfd/da9150.txt b/Documentation/devicetree/bindings/mfd/da9150.txt
new file mode 100644
index 000000000000..d0588eaa0d71
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/da9150.txt
@@ -0,0 +1,43 @@
+Dialog Semiconductor DA9150 Combined Charger/Fuel-Gauge MFD bindings
+
+DA9150 consists of a group of sub-devices:
+
+Device                   Description
+------                   -----------
+da9150-gpadc            : General Purpose ADC
+da9150-charger          : Battery Charger
+
+======
+
+Required properties:
+- compatible : Should be "dlg,da9150"
+- reg: Specifies the I2C slave address
+- interrupt-parent: Specifies the phandle of the interrupt controller to which
+  the IRQs from da9150 are delivered to.
+- interrupts: IRQ line info for da9150 chip.
+- interrupt-controller: da9150 has internal IRQs (own IRQ domain).
+  (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for
+   further information relating to interrupt properties)
+
+Sub-devices:
+- da9150-gpadc: See Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt
+- da9150-charger: See Documentation/devicetree/bindings/power/da9150-charger.txt
+
+
+Example:
+
+        charger_fg: da9150@58 {
+                compatible = "dlg,da9150";
+                reg = <0x58>;
+                interrupt-parent = <&gpio6>;
+                interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+                interrupt-controller;
+
+                gpadc: da9150-gpadc {
+                        ...
+                };
+
+                da9150-charger {
+                        ...
+                };
+        };
diff --git a/Documentation/devicetree/bindings/mfd/mt6397.txt b/Documentation/devicetree/bindings/mfd/mt6397.txt
new file mode 100644
index 000000000000..15043e652699
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/mt6397.txt
@@ -0,0 +1,70 @@
+MediaTek MT6397 Multifunction Device Driver
+
+MT6397 is a multifunction device with the following sub modules:
+- Regulator
+- RTC
+- Audio codec
+- GPIO
+- Clock
+
+It is interfaced to host controller using SPI interface by a proprietary hardware
+called PMIC wrapper or pwrap. MT6397 MFD is a child device of pwrap.
+See the following for pwarp node definitions:
+Documentation/devicetree/bindings/soc/pwrap.txt
+
+This document describes the binding for MFD device and its sub module.
+
+Required properties:
+compatible: "mediatek,mt6397"
+
+Optional subnodes:
+
+- rtc
+        Required properties:
+                - compatible: "mediatek,mt6397-rtc"
+- regulators
+        Required properties:
+                - compatible: "mediatek,mt6397-regulator"
+        see Documentation/devicetree/bindings/regulator/mt6397-regulator.txt
+- codec
+        Required properties:
+                - compatible: "mediatek,mt6397-codec"
+- clk
+        Required properties:
+                - compatible: "mediatek,mt6397-clk"
+
+Example:
+        pwrap: pwrap@1000f000 {
+                compatible = "mediatek,mt8135-pwrap";
+
+                ...
+
+                pmic {
+                        compatible = "mediatek,mt6397";
+
+                        codec: mt6397codec {
+                                compatible = "mediatek,mt6397-codec";
+                        };
+
+                        regulators {
+                                compatible = "mediatek,mt6397-regulator";
+
+                                mt6397_vpca15_reg: buck_vpca15 {
+                                        regulator-compatible = "buck_vpca15";
+                                        regulator-name = "vpca15";
+                                        regulator-min-microvolt = <850000>;
+                                        regulator-max-microvolt = <1400000>;
+                                        regulator-ramp-delay = <12500>;
+                                        regulator-always-on;
+                                };
+
+                                mt6397_vgp4_reg: ldo_vgp4 {
+                                        regulator-compatible = "ldo_vgp4";
+                                        regulator-name = "vgp4";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-enable-ramp-delay = <218>;
+                                };
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
index 7182b8857f57..6ac06c1b9aec 100644
--- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
+++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.txt
@@ -15,10 +15,21 @@ each. A function can consume one or more of these fixed-size register regions.
 
 Required properties:
 - compatible:      Should contain one of:
-                     "qcom,pm8941"
-                     "qcom,pm8841"
-                     "qcom,pma8084"
-                     or generalized "qcom,spmi-pmic".
+                   "qcom,pm8941",
+                   "qcom,pm8841",
+                   "qcom,pma8084",
+                   "qcom,pm8019",
+                   "qcom,pm8226",
+                   "qcom,pm8110",
+                   "qcom,pma8084",
+                   "qcom,pmi8962",
+                   "qcom,pmd9635",
+                   "qcom,pm8994",
+                   "qcom,pmi8994",
+                   "qcom,pm8916",
+                   "qcom,pm8004",
+                   "qcom,pm8909",
+                   or generalized "qcom,spmi-pmic".
 - reg:             Specifies the SPMI USID slave address for this device.
                    For more information see:
                    Documentation/devicetree/bindings/spmi/spmi.txt
diff --git a/Documentation/devicetree/bindings/mfd/qcom-rpm.txt b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt
index 85e31980017a..5e97a9593ad7 100644
--- a/Documentation/devicetree/bindings/mfd/qcom-rpm.txt
+++ b/Documentation/devicetree/bindings/mfd/qcom-rpm.txt
@@ -12,6 +12,7 @@ frequencies.
                     "qcom,rpm-apq8064"
                     "qcom,rpm-msm8660"
                     "qcom,rpm-msm8960"
+                    "qcom,rpm-ipq8064"
 
 - reg:
         Usage: required
@@ -31,16 +32,6 @@ frequencies.
         Value type: <string-array>
         Definition: must be the three strings "ack", "err" and "wakeup", in order
 
-- #address-cells:
-        Usage: required
-        Value type: <u32>
-        Definition: must be 1
-
-- #size-cells:
-        Usage: required
-        Value type: <u32>
-        Definition: must be 0
-
 - qcom,ipc:
         Usage: required
         Value type: <prop-encoded-array>
@@ -52,6 +43,188 @@ frequencies.
                     - u32 representing the ipc bit within the register
 
 
+= SUBNODES
+
+The RPM exposes resources to its subnodes. The below bindings specify the set
+of valid subnodes that can operate on these resources.
+
+== Regulators
+
+Regulator nodes are identified by their compatible:
+
+- compatible:
+        Usage: required
+        Value type: <string>
+        Definition: must be one of:
+                    "qcom,rpm-pm8058-regulators"
+                    "qcom,rpm-pm8901-regulators"
+                    "qcom,rpm-pm8921-regulators"
+
+- vdd_l0_l1_lvs-supply:
+- vdd_l2_l11_l12-supply:
+- vdd_l3_l4_l5-supply:
+- vdd_l6_l7-supply:
+- vdd_l8-supply:
+- vdd_l9-supply:
+- vdd_l10-supply:
+- vdd_l13_l16-supply:
+- vdd_l14_l15-supply:
+- vdd_l17_l18-supply:
+- vdd_l19_l20-supply:
+- vdd_l21-supply:
+- vdd_l22-supply:
+- vdd_l23_l24_l25-supply:
+- vdd_ncp-supply:
+- vdd_s0-supply:
+- vdd_s1-supply:
+- vdd_s2-supply:
+- vdd_s3-supply:
+- vdd_s4-supply:
+        Usage: optional (pm8058 only)
+        Value type: <phandle>
+        Definition: reference to regulator supplying the input pin, as
+                    described in the data sheet
+
+- lvs0_in-supply:
+- lvs1_in-supply:
+- lvs2_in-supply:
+- lvs3_in-supply:
+- mvs_in-supply:
+- vdd_l0-supply:
+- vdd_l1-supply:
+- vdd_l2-supply:
+- vdd_l3-supply:
+- vdd_l4-supply:
+- vdd_l5-supply:
+- vdd_l6-supply:
+- vdd_s0-supply:
+- vdd_s1-supply:
+- vdd_s2-supply:
+- vdd_s3-supply:
+- vdd_s4-supply:
+        Usage: optional (pm8901 only)
+        Value type: <phandle>
+        Definition: reference to regulator supplying the input pin, as
+                    described in the data sheet
+
+- vdd_l1_l2_l12_l18-supply:
+- vdd_l3_l15_l17-supply:
+- vdd_l4_l14-supply:
+- vdd_l5_l8_l16-supply:
+- vdd_l6_l7-supply:
+- vdd_l9_l11-supply:
+- vdd_l10_l22-supply:
+- vdd_l21_l23_l29-supply:
+- vdd_l24-supply:
+- vdd_l25-supply:
+- vdd_l26-supply:
+- vdd_l27-supply:
+- vdd_l28-supply:
+- vdd_ncp-supply:
+- vdd_s1-supply:
+- vdd_s2-supply:
+- vdd_s4-supply:
+- vdd_s5-supply:
+- vdd_s6-supply:
+- vdd_s7-supply:
+- vdd_s8-supply:
+- vin_5vs-supply:
+- vin_lvs1_3_6-supply:
+- vin_lvs2-supply:
+- vin_lvs4_5_7-supply:
+        Usage: optional (pm8921 only)
+        Value type: <phandle>
+        Definition: reference to regulator supplying the input pin, as
+                    described in the data sheet
+
+The regulator node houses sub-nodes for each regulator within the device. Each
+sub-node is identified using the node's name, with valid values listed for each
+of the pmics below.
+
+pm8058:
+        l0, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12, l13, l14, l15,
+        l16, l17, l18, l19, l20, l21, l22, l23, l24, l25, s0, s1, s2, s3, s4,
+        lvs0, lvs1, ncp
+
+pm8901:
+        l0, l1, l2, l3, l4, l5, l6, s0, s1, s2, s3, s4, lvs0, lvs1, lvs2, lvs3,
+        mvs
+
+pm8921:
+        s1, s2, s3, s4, s7, s8, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11,
+        l12, l14, l15, l16, l17, l18, l21, l22, l23, l24, l25, l26, l27, l28,
+        l29, lvs1, lvs2, lvs3, lvs4, lvs5, lvs6, lvs7, usb-switch, hdmi-switch,
+        ncp
+
+The content of each sub-node is defined by the standard binding for regulators -
+see regulator.txt - with additional custom properties described below:
+
+=== Switch-mode Power Supply regulator custom properties
+
+- bias-pull-down:
+        Usage: optional
+        Value type: <empty>
+        Definition: enable pull down of the regulator when inactive
+
+- qcom,switch-mode-frequency:
+        Usage: required
+        Value type: <u32>
+        Definition: Frequency (Hz) of the switch-mode power supply;
+                    must be one of:
+                    19200000, 9600000, 6400000, 4800000, 3840000, 3200000,
+                    2740000, 2400000, 2130000, 1920000, 1750000, 1600000,
+                    1480000, 1370000, 1280000, 1200000
+
+- qcom,force-mode:
+        Usage: optional (default if no other qcom,force-mode is specified)
+        Value type: <u32>
+        Defintion: indicates that the regulator should be forced to a
+                   particular mode, valid values are:
+                   QCOM_RPM_FORCE_MODE_NONE - do not force any mode
+                   QCOM_RPM_FORCE_MODE_LPM - force into low power mode
+                   QCOM_RPM_FORCE_MODE_HPM - force into high power mode
+                   QCOM_RPM_FORCE_MODE_AUTO - allow regulator to automatically
+                                              select its own mode based on
+                                              realtime current draw, only for:
+                                              pm8921 smps and ftsmps
+
+- qcom,power-mode-hysteretic:
+        Usage: optional
+        Value type: <empty>
+        Definition: select that the power supply should operate in hysteretic
+                    mode, instead of the default pwm mode
+
+=== Low-dropout regulator custom properties
+
+- bias-pull-down:
+        Usage: optional
+        Value type: <empty>
+        Definition: enable pull down of the regulator when inactive
+
+- qcom,force-mode:
+        Usage: optional
+        Value type: <u32>
+        Defintion: indicates that the regulator should not be forced to any
+                   particular mode, valid values are:
+                   QCOM_RPM_FORCE_MODE_NONE - do not force any mode
+                   QCOM_RPM_FORCE_MODE_LPM - force into low power mode
+                   QCOM_RPM_FORCE_MODE_HPM - force into high power mode
+                   QCOM_RPM_FORCE_MODE_BYPASS - set regulator to use bypass
+                                                mode, i.e.  to act as a switch
+                                                and not regulate, only for:
+                                                pm8921 pldo, nldo and nldo1200
+
+=== Negative Charge Pump custom properties
+
+- qcom,switch-mode-frequency:
+        Usage: required
+        Value type: <u32>
+        Definition: Frequency (Hz) of the swith mode power supply;
+                    must be one of:
+                    19200000, 9600000, 6400000, 4800000, 3840000, 3200000,
+                    2740000, 2400000, 2130000, 1920000, 1750000, 1600000,
+                    1480000, 1370000, 1280000, 1200000
+
 = EXAMPLE
 
         #include <dt-bindings/mfd/qcom-rpm.h>
@@ -64,7 +237,28 @@ frequencies.
                 interrupts = <0 19 0>, <0 21 0>, <0 22 0>;
                 interrupt-names = "ack", "err", "wakeup";
 
-                #address-cells = <1>;
-                #size-cells = <0>;
+                regulators {
+                        compatible = "qcom,rpm-pm8921-regulators";
+                        vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
+
+                        s1 {
+                                regulator-min-microvolt = <1225000>;
+                                regulator-max-microvolt = <1225000>;
+
+                                bias-pull-down;
+
+                                qcom,switch-mode-frequency = <3200000>;
+                        };
+
+                        pm8921_s4: s4 {
+                                regulator-min-microvolt = <1800000>;
+                                regulator-max-microvolt = <1800000>;
+
+                                qcom,switch-mode-frequency = <1600000>;
+                                bias-pull-down;
+
+                                qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
+                        };
+                };
         };
 
diff --git a/Documentation/devicetree/bindings/mfd/sky81452.txt b/Documentation/devicetree/bindings/mfd/sky81452.txt
new file mode 100644
index 000000000000..35181794aa24
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/sky81452.txt
@@ -0,0 +1,35 @@
+SKY81452 bindings
+
+Required properties:
+- compatible    : Must be "skyworks,sky81452"
+- reg           : I2C slave address
+
+Required child nodes:
+- backlight     : container node for backlight following the binding
+                in video/backlight/sky81452-backlight.txt
+- regulator     : container node for regulators following the binding
+                in regulator/sky81452-regulator.txt
+
+Example:
+
+        sky81452@2c {
+                compatible = "skyworks,sky81452";
+                reg = <0x2c>;
+
+                backlight {
+                        compatible = "skyworks,sky81452-backlight";
+                        name = "pwm-backlight";
+                        led-sources = <0 1 2 3 6>;
+                        skyworks,ignore-pwm;
+                        skyworks,phase-shift;
+                        skyworks,current-limit = <2300>;
+                };
+
+                regulator {
+                        lout {
+                                regulator-name = "sky81452-lout";
+                                regulator-min-microvolt = <4500000>;
+                                regulator-max-microvolt = <8000000>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index fae26d014aaf..9b98bd89cfe2 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -167,6 +167,7 @@ sii	Seiko Instruments, Inc.
 silergy Silergy Corp.
 sirf    SiRF Technology, Inc.
 sitronix        Sitronix Technology Corporation
+skyworks        Skyworks Solutions, Inc.
 smsc    Standard Microsystems Corporation
 snps    Synopsys, Inc.
 solidrun        SolidRun
@@ -194,6 +195,7 @@ voipac	Voipac Technologies s.r.o.
 winbond Winbond Electronics corp.
 wlf     Wolfson Microelectronics
 wm      Wondermedia Technologies, Inc.
+x-powers        X-Powers
 xes     Extreme Engineering Solutions (X-ES)
 xillybus        Xillybus Ltd.
 xlnx    Xilinx
diff --git a/Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt b/Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt
new file mode 100644
index 000000000000..8bf2940f54bc
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt
@@ -0,0 +1,29 @@
+SKY81452-backlight bindings
+
+Required properties:
+- compatible            : Must be "skyworks,sky81452-backlight"
+
+Optional properties:
+- name                  : Name of backlight device. Default is 'lcd-backlight'.
+- gpios                 : GPIO to use to EN pin.
+                        See Documentation/devicetree/bindings/gpio/gpio.txt
+- led-sources           : List of enabled channels from 0 to 5.
+                        See Documentation/devicetree/bindings/leds/common.txt
+- skyworks,ignore-pwm   : Ignore both PWM input
+- skyworks,dpwm-mode    : Enable DPWM dimming mode, otherwise Analog dimming.
+- skyworks,phase-shift  : Enable phase shift mode
+- skyworks,short-detection-threshold-volt
+                        : It should be one of 4, 5, 6 and 7V.
+- skyworks,current-limit-mA
+                        : It should be 2300mA or 2750mA.
+
+Example:
+
+        backlight {
+                compatible = "skyworks,sky81452-backlight";
+                name = "pwm-backlight";
+                led-sources = <0 1 2 5>;
+                skyworks,ignore-pwm;
+                skyworks,phase-shift;
+                skyworks,current-limit-mA = <2300>;
+        };