Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y: (406 commits)
  ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module
  ASoC: OMAP4+: AESS: aess_mem: Activate AESS for memory/register access
  ARM: dts: OMAP5: AESS: Fix AESS L3 Interconnect address
  ASoC: OMAP: ABE: Pick working ABE support from LDC audio branch
  TI-Integration: ARM: OMAP2+: Fix merege by restoring omap_mcasp_init() call
  omapdss: TFCS panel: Check for successful TLC driver registration before using it
  omapdss: DSS DPLLs: Ignore PLL_PWR_STATUS on DRA7
  ARM: DRA7: dts: Add the sdma dt node and corresponding dma request lines for mmc
  ARM: dra7: dts: Add a fixed regulator node needed for eMMC
  arm/dts: dra7: Add ldo regulator for mmc1
  arm/dts: dra7: Add mmc controller nodes and board data
  ARM: DRA: hwmod: Correct the dma line names for mmc
  arch: arm: configs: Add support for DRA7 evm in omap2plus_defconfig
  arm: dts: dra7-evm: Add pinmux configs needed for display
  HACK: pinctrl: pinctrl single: Make pinctrl-single init early
  OMAPDSS:HDMI: Change PLL calculations
  omapdss: hdmi: fix deepcolor mode configuration
  ARM: dts: DRA7x: Add DMM bindings
  omapdrm: hack: Assign managers/channel to outputs in a more trivial way
  gpu: drm: omap: Use bitmaps for placement
  ...

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>

11 files changed, 492 insertions, 56 deletions

diff --git a/Documentation/devicetree/bindings/arm/omap/dmm.txt b/Documentation/devicetree/bindings/arm/omap/dmm.txt
new file mode 100644
index 00000000000..fb7232e2f80
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/omap/dmm.txt
@@ -0,0 +1,17 @@
+OMAP Dynamic Memory Manager (DMM) bindings
+
+Required properties:
+- compatible:   Must be "ti,omap4-dmm" for OMAP4 family
+                Must be "ti,omap5-dmm" for OMAP5 family
+- reg:         Contains timer register address range (base address and length)
+- interrupts:  Contains interrupt information (source, etc) for the DMM IRQ
+- ti,hwmods:   Name of the hwmod associated to the counter, which is typically
+                "dmm"
+
+Example:
+
+dmm: dmm@4e000000 {
+        compatible = "ti,omap4-dmm";
+        reg = <0x4e000000 0x800>;
+        ti,hwmods = "dmm";
+};
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
index d0051a75058..4f87488af6c 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -56,3 +56,6 @@ Boards:
 
 - OMAP5 EVM : Evaluation Module
   compatible = "ti,omap5-evm", "ti,omap5"
+
+- DRA7 EVM:  Software Developement Board for DRA7XX
+  compatible = "ti,dra7-evm", "ti,dra7"
diff --git a/Documentation/devicetree/bindings/clock/palmas-clk.txt b/Documentation/devicetree/bindings/clock/palmas-clk.txt
new file mode 100644
index 00000000000..26fbc9ff496
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/palmas-clk.txt
@@ -0,0 +1,27 @@
+* palmas and palmas-charger resource clock IP block devicetree bindings
+
+Required properties:
+- compatible : Should be from the list
+  ti,twl6035-clk
+  ti,twl6036-clk
+  ti,twl6037-clk
+  ti,tps65913-clk
+  ti,tps65914-clk
+  ti,tps80036-clk
+and also the generic series names
+  ti,palmas-clk
+
+Optional properties:
+- ti,clk32g-mode-sleep          - mode to adopt in pmic sleep 0 - off, 1 - on
+- ti,clkg32kgaudio-mode-sleep   - see above
+
+Example:
+
+clk {
+    compatible = "ti,twl6035-clk", "ti,palmas-clk";
+    ti,clk32kg-mode-sleep = <0>;
+    ti,clk32kgaudio-mode-sleep = <0>;
+    #clock-cells = <1>;
+    clock-frequency = <32000000>;
+    clock-names = "clk32kg", "clk32kgaudio";
+};
diff --git a/Documentation/devicetree/bindings/gpio/gpio-palmas.txt b/Documentation/devicetree/bindings/gpio/gpio-palmas.txt
new file mode 100644
index 00000000000..688eebbbcb9
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-palmas.txt
@@ -0,0 +1,35 @@
+* palmas and palmas charger GPIO IP block devicetree bindings
+
+Required properties:
+- compatible : Should be from the list
+  ti,twl6035-gpio
+  ti,twl6036-gpio
+  ti,twl6037-gpio
+  ti,tps65913-gpio
+  ti,tps65914-gpio
+  ti,tps80036-gpio
+
+and also the generic series names
+
+  ti,palmas-gpio
+
+- gpio-controller: mark the device as a GPIO controller
+- gpio-cells = <1>:  GPIO lines are provided.
+- interrupt-controller : palmas has its own internal IRQs
+- #interrupt-cells : should be set to 2 for IRQ number and flags
+  The first cell is the IRQ number.
+  The second cell is the flags, encoded as the trigger masks from
+  Documentation/devicetree/bindings/interrupts.txt
+- interrupt-parent : The parent interrupt controller.
+
+Example:
+
+gpio {
+    compatible = "ti,twl6035-gpio", "ti,palmas-gpio";
+
+    gpio-controller;
+    #gpio-cells = <1>;
+    interrupt-parent = <&palmas>;
+    interrupt-controller;
+    #interrupt-cells = <2>;
+};
diff --git a/Documentation/devicetree/bindings/input/palmas-pwrbutton.txt b/Documentation/devicetree/bindings/input/palmas-pwrbutton.txt
new file mode 100644
index 00000000000..722ca942efa
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/palmas-pwrbutton.txt
@@ -0,0 +1,26 @@
+* palmas and palmas-charger Button IP block devicetree bindings
+
+Required properties:
+- compatible : Should be from the list
+  ti,twl6035-pwrbutton
+  ti,twl6036-pwrbutton
+  ti,twl6037-pwrbutton
+  ti,tps65913-pwrbutton
+  ti,tps65914-pwrbutton
+  ti,tps80036-pwrbutton
+and also the generic series names
+  ti,palmas-pwrbutton
+
+- interrupts: the interrupt outputs of the controller.
+- interrupt-names : Should be the name of irq resource. Each interrupt
+  binds its interrupt-name.
+- interrupt-parent : The parent interrupt controller.
+
+Example:
+
+pwrbutton {
+    compatible = "ti,twl6035-pwrbutton", "ti,palmas-pwrbutton";
+    interrupt-parent = <&palmas>;
+    interrupts = <1 0>;
+    interrupt-names = "pwron-irq";
+};
diff --git a/Documentation/devicetree/bindings/leds/leds-palmas.txt b/Documentation/devicetree/bindings/leds/leds-palmas.txt
new file mode 100644
index 00000000000..0264969717f
--- /dev/null
+++ b/Documentation/devicetree/bindings/leds/leds-palmas.txt
@@ -0,0 +1,36 @@
+* palmas and palmas-charger LED IP block devicetree bindings
+
+Required properties:
+- compatible : Should be from the list
+  ti,twl6035-leds
+  ti,twl6036-leds
+  ti,twl6037-leds
+  ti,tps65913-leds
+  ti,tps65914-leds
+  ti,tps80036-leds
+and also the generic series names
+  ti,palmas-leds
+
+Optional properties:
+-ti,led1-current        - sink current setting 0 - 0mA, 1 - 25mA, 2 - 5mA,
+                                3 - 0mA, 4 - 5mA, 5 - 5mA, 6 - 10.0mA, 7 - 0mA
+-ti,led2-current        - see above
+-ti,led3-current        - see above
+-ti,led4-current        - see above
+-ti,chrg-led-mode       - only valid for charger - mode for charging led operation
+                                0 - Charging indicator
+                                1 - controlled as a general purpose LED
+-ti,chrg-led-vbat-low   - only valid for charger - blinking of low battery led
+                                0 - blinking is enabled,
+                                1 - blinking is disabled
+
+Example:
+leds {
+        compatible = "ti,twl6035-leds", "ti,palmas-leds";
+        ti,led1-current = <0>;
+        ti,led2-current = <0>;
+        ti,led3-current = <0>;
+        ti,led4-current = <0>;
+        ti,chrg-led-mode = <0>;
+        ti,chrg-led-vbat-low = <0>;
+};
diff --git a/Documentation/devicetree/bindings/mfd/palmas.txt b/Documentation/devicetree/bindings/mfd/palmas.txt
index 94a0c127894..3defba700ee 100644
--- a/Documentation/devicetree/bindings/mfd/palmas.txt
+++ b/Documentation/devicetree/bindings/mfd/palmas.txt
@@ -1,67 +1,82 @@
-Texas Instruments Palmas family
-
-The Palmas familly are Integrated Power Management Chips.
-These chips are connected to an i2c bus.
+* palmas and palmas-charger device tree bindings
 
+The TI palmas family current members :-
+twl6035 (palmas)
+twl6036 (palmas-charger)
+twl6037 (palmas)
+tps65913 (palmas)
+tps65914 (palmas)
+tps80036 (palmas-charger)
 
 Required properties:
-- compatible : Must be "ti,palmas";
-  For Integrated power-management in the palmas series, twl6035, twl6037,
-  tps65913
-- interrupts : This i2c device has an IRQ line connected to the main SoC
-- interrupt-controller : Since the palmas support several interrupts internally,
-  it is considered as an interrupt controller cascaded to the SoC one.
-- #interrupt-cells = <1>;
+- compatible : Should be from the list
+  ti,twl6035
+  ti,twl6036
+  ti,twl6037
+  ti,tps65913
+  ti,tps65914
+  ti,tps80036
+  ti,tps659038
+and also the generic series names
+  ti,palmas
+  ti,palmas-charger
+- interrupt-controller : palmas has its own internal IRQs
+- #interrupt-cells : should be set to 2 for IRQ number and flags
+  The first cell is the IRQ number.
+  The second cell is the flags, encoded as the trigger masks from
+  Documentation/devicetree/bindings/interrupts.txt
 - interrupt-parent : The parent interrupt controller.
 
-Optional node:
-- Child nodes contain in the palmas. The palmas family is made of several
-  variants that support a different number of features.
-  The child nodes will thus depend of the capability of the variant.
-- mux_pad1 if a value is given it will be used for the pad1 mux
-- mux_pad2 if a value us given it will be used for the pad2 mux
-- power_ctrl if a value is given it will be written to the POWER_CTRL register
+Optional properties:
+  ti,mux_padX : set the pad register X (1-2) to the correct muxing for the
+                hardware, if not set will use muxing in OTP.
 
 Example:
-/*
- * Integrated Power Management Chip Palmas
- */
-palmas@48 {
-    compatible = "ti,palmas";
-    reg = <0x48>;
-    interrupts = <39>; /* IRQ_SYS_1N cascaded to gic */
-    interrupt-controller;
-    #interrupt-cells = <1>;
-    interrupt-parent = <&gic>;
-    #address-cells = <1>;
-    #size-cells = <0>;
 
-        ti,mux_pad1 = <0x00>;
-        ti,mux_pad2 = <0x00>;
-        ti,power_ctrl = <0x03>;
+palmas {
+        compatible = "ti,twl6035", "ti,palmas";
+        reg = <0x48>
+        interrupt-parent = <&intc>;
+        interrupt-controller;
+        #interrupt-cells = <2>;
+
+        ti,mux-pad1 = <0>;
+        ti,mux-pad2 = <0>;
+
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        pmic {
+                compatible = "ti,twl6035-pmic", "ti,palmas-pmic";
+                ....
+        }
+
+        gpio {
+                compatible = "ti,twl6035-gpio", "ti,palmas-gpio";
+                ....
+        };
+
+        wdt {
+                compatible = "ti,twl6035-wdt", "ti,palmas-wdt";
+                ....
+        };
+
+        rtc {
+                compatible = "ti,twl6035-rtc", "ti,palmas-rtc";
+                ....
+        };
 
-        palmas_pmic {
-                compatible = "ti,palmas_pmic";
-                regulators {
-                        smps12_reg: smps12 {
-                                regulator-min-microvolt = < 600000>;
-                regulator-max-microvolt = <1500000>;
-                                regulator-always-on;
-                                regulator-boot-on;
-                ti,warm_sleep = <0>;
-                ti,roof_floor = <0>;
-                ti,mode_sleep = <0>;
-                ti,warm_reset = <0>;
-                ti,tstep = <0>;
-                ti,vsel = <0>;
-                        };
-                };
-                ti,ldo6_vibrator = <0>;
+        pwrbutton {
+                compatible = "ti,twl6035-pwrbutton", "ti,palmas-pwrbutton";
+                ....
         };
 
-    palmas_rtc {
-        compatible = "ti,palmas_rtc";
-        interrupts = <8 9>;
-        reg = <0>;
-    };
-};
+        leds {
+                compatible = "ti,twl6035-leds", "ti-palmas-leds";
+        }
+
+        clk {
+                compatible = "ti,twl6035-clk", "ti,palmas-clk";
+                ....
+        };
+}
diff --git a/Documentation/devicetree/bindings/regulator/palmas-pmic.txt b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
new file mode 100644
index 00000000000..46bdd6e0d7e
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/palmas-pmic.txt
@@ -0,0 +1,169 @@
+* palmas and palmas-charger regulator IP block devicetree bindings
+
+Required properties:
+- compatible : Should be from the list
+  ti,twl6035-pmic
+  ti,twl6036-pmic
+  ti,twl6037-pmic
+  ti,tps65913-pmic
+  ti,tps65914-pmic
+  ti,tps80036-pmic
+  ti,tps659038-pmic
+and also the generic series names
+  ti,palmas-pmic
+
+Optional properties:
+- ti,ldo6-vibrator : ldo6 is in vibrator mode
+
+Optional nodes:
+- regulators : should contain the constrains and init information for the
+               regulators. It should contain a subnode per regulator from the
+               list.
+               For ti,palmas-pmic - smps12, smps123, smps3 depending on OTP,
+               smps45, smps457, smps7 depending on varient, smps6, smps[8-10],
+               ldo[1-9], ldoln, ldousb
+               For ti,palmas-charger-pmic - smps12, smps123, smps3 depending on OTP,
+               smps[6-9], boost, ldo[1-14], ldoln, ldousb
+
+               optional chip specific regulator fields :-
+               ti,warm-reset - maintain voltage during warm reset
+               ti,roof-floor - control voltage selection by pin
+               ti,sleep-mode - mode to adopt in pmic sleep 0 - off, 1 - auto,
+               2 - eco, 3 - forced pwm
+               ti,tstep - slope control 0 - Jump, 1 10mV/us, 2 5mV/us, 3 2.5mV/us
+               ti,smps-range - OTP has the wrong range set for the hardware so override
+               0 - low range, 1 - high range
+
+Example:
+
+pmic@0 {
+        compatible = "ti,twl6035-pmic", "ti,palmas-pmic";
+        interrupt-parent = <&palmas>;
+        interrupts = <14 0>;
+        interrupt-name = "short-irq";
+
+        ti,ldo6_vibrator;
+
+        regulators {
+                smps12_reg : smps12 {
+                        regulator-name = "smps12";
+                        regulator-min-microvolt = < 600000>;
+                        regulator-max-microvolt = <1500000>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        ti,warm-reset;
+                        ti,roof-floor;
+                        ti,mode-sleep = <0>;
+                        ti,tstep = <0>;
+                        ti,smps-range = <1>;
+                };
+
+                smps3_reg: smps3 {
+                        regulator-name = "smps3";
+                        regulator-min-microvolt = < 600000>;
+                        regulator-max-microvolt = <1310000>;
+                };
+
+                smps45_reg: smps45 {
+                        regulator-name = "smps45";
+                        regulator-min-microvolt = < 600000>;
+                        regulator-max-microvolt = <1310000>;
+                };
+
+                smps6_reg: smps6 {
+                        regulator-name = "smps6";
+                        regulator-min-microvolt = <1200000>;
+                        regulator-max-microvolt = <1200000>;
+                };
+
+                smps7_reg: smps7 {
+                        regulator-name = "smps7";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                };
+
+                smps8_reg: smps8 {
+                        regulator-name = "smps8";
+                        regulator-min-microvolt = < 600000>;
+                        regulator-max-microvolt = <1310000>;
+                };
+
+                smps9_reg: smps9 {
+                        regulator-name = "smps9";
+                        regulator-min-microvolt = <2100000>;
+                        regulator-max-microvolt = <2100000>;
+                };
+
+                smps10_reg: smps10 {
+                        regulator-name = "smps10";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                };
+
+                ldo1_reg: ldo1 {
+                        regulator-name = "ldo1";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                };
+
+                ldo2_reg: ldo2 {
+                        regulator-name = "ldo2";
+                        regulator-min-microvolt = <2900000>;
+                        regulator-max-microvolt = <2900000>;
+                };
+
+                ldo3_reg: ldo3 {
+                        regulator-name = "ldo3";
+                        regulator-min-microvolt = <3000000>;
+                        regulator-max-microvolt = <3000000>;
+                };
+
+                ldo4_reg: ldo4 {
+                        regulator-name = "ldo4";
+                        regulator-min-microvolt = <2200000>;
+                        regulator-max-microvolt = <2200000>;
+                };
+
+                ldo5_reg: ldo5 {
+                        regulator-name = "ldo5";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                };
+
+                ldo6_reg: ldo6 {
+                        regulator-name = "ldo6";
+                        regulator-min-microvolt = <1500000>;
+                        regulator-max-microvolt = <1500000>;
+                };
+
+                ldo7_reg: ldo7 {
+                        regulator-name = "ldo7";
+                        regulator-min-microvolt = <1500000>;
+                        regulator-max-microvolt = <1500000>;
+                };
+
+                ldo8_reg: ldo8 {
+                        regulator-name = "ldo8";
+                        regulator-min-microvolt = <1500000>;
+                        regulator-max-microvolt = <1500000>;
+                };
+
+                ldo9_reg: ldo9 {
+                        regulator-name = "ldo9";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                };
+
+                ldoln_reg: ldoln {
+                        regulator-name = "ldoln";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                };
+
+                ldousb_reg: ldousb {
+                        regulator-name = "ldousb";
+                        regulator-min-microvolt = <3250000>;
+                        regulator-max-microvolt = <3250000>;
+                };
+        };
+};
diff --git a/Documentation/devicetree/bindings/regulator/ti-avs-class0.txt b/Documentation/devicetree/bindings/regulator/ti-avs-class0.txt
new file mode 100644
index 00000000000..40b0c318dc0
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/ti-avs-class0.txt
@@ -0,0 +1,66 @@
+Texas Instrument SmartReflex AVS Class 0 Regulator
+
+Required properties:
+- compatible: "ti,avsclass0"
+- reg: Should contain Efuse registers location and length
+- avs-supply: The supply for AVS block
+- efuse-settings: An array of 2-tuples items, and each item consists
+  of Voltage index and efuse offset(from reg) like: <voltage offset>
+        voltage: Voltage index in microvolts (also called nominal voltage)
+        offset: ofset in bytes from base provided in reg
+  NOTE: min_uV, max_uV are pickedup from this list
+
+Optional properties:
+- voltage-tolerance: Specify the voltage tolerance in percentage
+- ti,avsclass0-microvolt-values: Boolean property indicating that the efuse
+  values are in microvolts
+
+Example #1: single rails:
+soc.dtsi:
+avs_mpu: regulator-avs@0x40200000 {
+        compatible = "ti,avsclass0";
+        reg = <0x40200000 0x20>;
+        efuse-settings = <975000 0
+                1075000 4
+                1200000 8>;
+};
+
+avs_core: regulator-avs@0x40300000 {
+        compatible = "ti,avsclass0";
+        reg = <0x40300000 0x20>;
+        efuse-settings = <975000 0
+                1050000 4>;
+};
+
+board.dtsi:
+&avs_mpu {
+                avs-supply = <&vcc>;
+};
+&avs_core {
+                avs-supply = <&smps2>;
+};
+
+Example #2: Ganged (combined) rails:
+soc.dtsi:
+avs_mpu: regulator-avs@0x40200000 {
+        compatible = "ti,avsclass0";
+        reg = <0x40200000 0x20>;
+        efuse-settings = <975000 0
+                1075000 4
+                1200000 8>;
+};
+
+avs_core: regulator-avs@0x40300000 {
+        compatible = "ti,avsclass0";
+        reg = <0x40300000 0x20>;
+        efuse-settings = <975000 0
+                1050000 4>;
+};
+
+board.dtsi:
+&avs_mpu {
+                avs-supply = <&smps3>;
+};
+&avs_core {
+                avs-supply = <&smps3>;
+};
diff --git a/Documentation/devicetree/bindings/rtc/palmas-rtc.txt b/Documentation/devicetree/bindings/rtc/palmas-rtc.txt
new file mode 100644
index 00000000000..f405b368ccd
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/palmas-rtc.txt
@@ -0,0 +1,21 @@
+* palmas and palmas-charger RTC IP block devicetree bindings
+
+Required properties:
+- compatible : Should be from the list
+  ti,twl6035-rtc
+  ti,twl6036-rtc
+  ti,twl6037-rtc
+  ti,tps65913-rtc
+  ti,tps65914-rtc
+  ti,tps80036-rtc
+and also the generic series names
+  ti,palmas-rtc
+
+Examples:
+
+rtc {
+    compatible = "ti,twl6035-rtc", "ti,palmas-rtc";
+    interrupt-parent = <&palmas>;
+    interrupts = <8 0 9 0>;
+    interrupt-name = "alarm-irq", "timer-irq";
+};
diff --git a/Documentation/devicetree/bindings/watchdog/palmas-wdt.txt b/Documentation/devicetree/bindings/watchdog/palmas-wdt.txt
new file mode 100644
index 00000000000..1553a0dce93
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/palmas-wdt.txt
@@ -0,0 +1,21 @@
+* palmas and palmas-charger Watchdog IP block devicetree bindings
+
+Required properties:
+- compatible : Should be from the list
+  ti,twl6035-wdt
+  ti,twl6036-wdt
+  ti,twl6037-wdt
+  ti,tps65913-wdt
+  ti,tps65914-wdt
+  ti,tps80036-wdt
+and also the generic series names
+  ti,palmas-wdt
+
+Examples:
+
+wdt {
+    compatible = "ti,twl6035-wdt", "ti,palmas-wdt";
+    interrupt-parent = <&palmas>;
+    interrupts = <10 0>;
+    interrupt-name = "watchdog-irq";
+};