Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into...

Conflicts:
	arch/arm/boot/dts/dra7.dtsi

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

diff --cc arch/arm/boot/dts/dra7.dtsi
index 098916f,8e50ca3..a4dec49
--- 1/arch/arm/boot/dts/dra7.dtsi
--- 2/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@@ -177,82 -261,6 +261,28 @@@
                        };
                };
  
-               cm_core_aon: cm_core_aon@4a005000 {
-                       compatible = "ti,dra7-cm-core-aon";
-                       reg = <0x4a005000 0x2000>;
- 
-                       cm_core_aon_clocks: clocks {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                       };
- 
-                       cm_core_aon_clockdomains: clockdomains {
-                       };
-               };
- 
-               cm_core: cm_core@4a008000 {
-                       compatible = "ti,dra7-cm-core";
-                       reg = <0x4a008000 0x3000>;
- 
-                       cm_core_clocks: clocks {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                       };
- 
-                       cm_core_clockdomains: clockdomains {
-                       };
-               };
- 
-               counter32k: counter@4ae04000 {
-                       compatible = "ti,omap-counter32k";
-                       reg = <0x4ae04000 0x40>;
-                       ti,hwmods = "counter_32k";
-               };
- 
 +              bandgap: bandgap@4a0021e0 {
 +                      reg = <0x4a0021e0 0xc
 +                              0x4a00232c 0xc
 +                              0x4a002380 0x2c
 +                              0x4a0023C0 0x3c
 +                              0x4a002564 0x8
 +                              0x4a002574 0x50>;
 +                              compatible = "ti,dra752-bandgap";
 +                              interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
 +                              #thermal-sensor-cells = <1>;
 +              };
 +
-               pbias_regulator: pbias_regulator {
-                       compatible = "ti,pbias-omap";
-                       reg = <0 0x4>;
-                       syscon = <&dra7_ctrl_general>;
-                       pbias_mmc_reg: pbias_mmc_omap5 {
-                               regulator-name = "pbias_mmc_omap5";
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3000000>;
-                       };
-               };
- 
-               dra7_pmx_core: pinmux@4a003400 {
-                       compatible = "ti,dra7-padconf", "pinctrl-single";
-                       reg = <0x4a003400 0x0464>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       #interrupt-cells = <1>;
-                       interrupt-controller;
-                       pinctrl-single,register-width = <32>;
-                       pinctrl-single,function-mask = <0x3fffffff>;
-               };
- 
 +              dra7_ctrl_core: ctrl_core@4a002000 {
 +                      compatible = "syscon";
 +                      reg = <0x4a002000 0x6d0>;
 +              };
 +
 +              dra7_ctrl_general: tisyscon@4a002e00 {
 +                      compatible = "syscon";
 +                      reg = <0x4a002e00 0x7c>;
 +              };
 +
                sdma: dma-controller@4a056000 {
                        compatible = "ti,omap4430-sdma";
                        reg = <0x4a056000 0x1000>;

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