Merge branch 'platform-ti-linux-3.14.y' into pm-ti-linux-3.14.y

Conflicts:
	arch/arm/common/edma.c
	arch/arm/mach-omap2/Makefile
	drivers/regulator/palmas-regulator.c
	include/dt-bindings/pinctrl/am43xx.h
	include/linux/mfd/palmas.h

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>

diff --cc arch/arm/boot/dts/am57xx-beagle-x15.dts
index 166b0b3e777cb3ed430efd7b5d0003cbb36e9069,34e9b6dbd55c2a68c8628f185856fee70af604a0..94f5a66af7fc70a8f3fb01c643ded750c22009f6
--- 1/arch/arm/boot/dts/am57xx-beagle-x15.dts
--- 2/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@@ -380,12 -232,8 +247,9 @@@
        tmp102: tmp102@48 {
                compatible = "ti,tmp102";
                reg = <0x48>;
-               pinctrl-names = "default", "sleep";
-               pinctrl-0 = <&tmp102_pins_default>;
-               pinctrl-1 = <&tmp102_pins_sleep>;
                interrupt-parent = <&gpio7>;
                interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
 +              #thermal-sensor-cells = <1>;
        };
  };
  
@@@ -413,32 -258,10 +274,30 @@@
  
  &uart3 {
          status = "okay";
-         pinctrl-names = "default";
-         pinctrl-0 = <&uart3_pins_default>;
  };
  
 +&voltdm_mpu {
 +      vdd-supply = <&smps12_reg>;
 +};
 +
 +&voltdm_dspeve {
 +      vdd-supply = <&smps45_reg>;
 +};
 +
 +&voltdm_gpu {
 +      vdd-supply = <&smps45_reg>;
 +};
 +
 +&voltdm_ivahd {
 +      vdd-supply = <&smps45_reg>;
 +};
 +
 +&voltdm_core {
 +      vdd-supply = <&smps6_reg>;
 +};
 +
  &cpu0 {
 -      cpu0-supply = <&smps12_reg>;
 +      cpu0-voltdm = <&voltdm_mpu>;
        voltage-tolerance = <1>;
  };
  

diff --cc arch/arm/boot/dts/dra7-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dra72-evm.dts
Simple merge

diff --cc arch/arm/boot/dts/omap4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge

diff --cc arch/arm/common/edma.c
index ffdc3d3b679d7a6c7ee9f6d9615e2af4878d4d55,c2cfc8d629bb1116e45f21244c905bc87583c351..4ed6cac4e67d7eff8a5ecc25dc538e045fa0a1b5
--- 1/arch/arm/common/edma.c
--- 2/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@@ -1764,7 -1782,14 +1784,15 @@@ static int edma_probe(struct platform_d
                        edma_write_array2(j, EDMA_DRAE, i, 1, 0x0);
                        edma_write_array(j, EDMA_QRAE, i, 0x0);
                }
 +              edma_cc[j]->info = info[j];
+ 
+               dmaengine_pdev = platform_device_register_full(
+                                                       &edma_dmaengine_dev[j]);
+               if (IS_ERR(dmaengine_pdev))
+                       dev_err(dev,
+                               "device%d for dmaengine register failed (%ld)",
+                               j, PTR_ERR(dmaengine_pdev));
+ 
                arch_num_cc++;
        }
  

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
index 11470ba1ba872deec7503d200f8bcd518fa6e049,647029598b26fdaa127b0158a569a5bf8314c3cd..e0dc02f4e998e5fd497887ab2c0a62270d53a85e
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -90,11 -87,10 +90,12 @@@ ifeq ($(CONFIG_PM),y
  obj-$(CONFIG_ARCH_OMAP2)              += pm24xx.o
  obj-$(CONFIG_ARCH_OMAP2)              += sleep24xx.o
  obj-$(CONFIG_ARCH_OMAP3)              += pm34xx.o sleep34xx.o
- obj-$(CONFIG_ARCH_OMAP4)              += pm44xx.o omap-mpuss-lowpower.o
- obj-$(CONFIG_SOC_OMAP5)                       += omap-mpuss-lowpower.o
- obj-$(CONFIG_SOC_DRA7XX)              += omap-mpuss-lowpower.o
+ omap-4-5-pm-common                    =  pm44xx.o omap-mpuss-lowpower.o
+ obj-$(CONFIG_ARCH_OMAP4)              += $(omap-4-5-pm-common)
+ obj-$(CONFIG_SOC_OMAP5)                       += $(omap-4-5-pm-common)
+ obj-$(CONFIG_SOC_DRA7XX)              += $(omap-4-5-pm-common)
 +obj-$(CONFIG_SOC_AM33XX)              += pm33xx.o sleep33xx.o
 +obj-$(CONFIG_SOC_AM43XX)              += pm33xx.o sleep43xx.o
  obj-$(CONFIG_PM_DEBUG)                        += pm-debug.o
  
  obj-$(CONFIG_POWER_AVS_OMAP)          += sr_device.o
@@@ -108,10 -102,11 +109,13 @@@ AFLAGS_sleep43xx.o                      :=-Wa,-march=armv7
  endif
  
  ifeq ($(CONFIG_CPU_IDLE),y)
 +obj-$(CONFIG_SOC_AM33XX)                += cpuidle33xx.o
 +obj-$(CONFIG_SOC_AM43XX)                += cpuidle43xx.o
  obj-$(CONFIG_ARCH_OMAP3)                += cpuidle34xx.o
- obj-$(CONFIG_ARCH_OMAP4)                += cpuidle44xx.o
+ omap-4-5-idle-common                  =  cpuidle44xx.o
+ obj-$(CONFIG_ARCH_OMAP4)              += $(omap-4-5-idle-common)
+ obj-$(CONFIG_SOC_OMAP5)                       += $(omap-4-5-idle-common)
+ obj-$(CONFIG_SOC_DRA7XX)              += $(omap-4-5-idle-common)
  endif
  
  # PRCM

diff --cc arch/arm/mach-omap2/common.h
Simple merge

diff --cc arch/arm/mach-omap2/control.h
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod.h
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_7xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/timer.c
index 64b16e5834b8e2cab9e76085200afab22e67160b,2d84fcb702c416fe851bb5623aaa9e2ec2722cdf..1ee3cb6482ddc0f4aa966a502c3ef8801b7cd1a0
--- 1/arch/arm/mach-omap2/timer.c
--- 2/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -54,8 -54,8 +54,9 @@@
  
  #include "soc.h"
  #include "common.h"
+ #include "control.h"
  #include "powerdomain.h"
 +#include "pm.h"
  #include "omap-secure.h"
  
  #define REALTIME_COUNTER_BASE                         0x48243200

diff --cc drivers/bus/omap_l3_noc.c
Simple merge

diff --cc drivers/clk/ti/dpll.c
Simple merge

diff --cc include/dt-bindings/pinctrl/am43xx.h
index 30e289596dbcd3f97b55d958bf6e8d56c4b3317e,725fa5055d6f8613bdb26db2433250c2d0b01a06..42f15398fcb0bd77ff201487def59da07cb5ace5
--- 1/include/dt-bindings/pinctrl/am43xx.h
--- 2/include/dt-bindings/pinctrl/am43xx.h
+++ b/include/dt-bindings/pinctrl/am43xx.h
@@@ -18,8 -18,8 +18,9 @@@
  #define PULL_DISABLE          (1 << 16)
  #define PULL_UP                       (1 << 17)
  #define INPUT_EN              (1 << 18)
- #define SLEWCTRL_FAST         (1 << 19)
 +#define DS0_FORCE_OFF_MODE    (1 << 24)
+ #define SLEWCTRL_FAST         0
+ #define SLEWCTRL_SLOW         (1 << 19)
  #define DS0_PULL_UP_DOWN_EN   (1 << 27)
  
  #define PIN_OUTPUT            (PULL_DISABLE)

diff --cc include/linux/clk/ti.h
Simple merge