From: Tony Lindgren <tony@atomide.com>
Date: Wed, 1 Apr 2015 19:24:29 +0000 (-0700)
Subject: Merge branch '4.0-rc1-prcm-cleanup-v6' of https://github.com/t-kristo/linux-pm into... 
X-Git-Tag: firefly_0821_release~176^2~1891^2~3^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=21295368367beaa563b310d5492166dba158b884;p=firefly-linux-kernel-4.4.55.git

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

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

21295368367beaa563b310d5492166dba158b884
diff --cc arch/arm/boot/dts/dra7.dtsi
index 098916f93811,8e50ca3fc102..a4dec49d0278
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@@ -177,82 -261,6 +261,28 @@@
  			};
  		};
  
 +		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>;
 +		};
 +
- 		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";
- 		};
- 
 +		dra7_ctrl_core: ctrl_core@4a002000 {
 +			compatible = "syscon";
 +			reg = <0x4a002000 0x6d0>;
 +		};
 +
 +		dra7_ctrl_general: tisyscon@4a002e00 {
 +			compatible = "syscon";
 +			reg = <0x4a002e00 0x7c>;
 +		};
 +
- 		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>;
- 		};
- 
  		sdma: dma-controller@4a056000 {
  			compatible = "ti,omap4430-sdma";
  			reg = <0x4a056000 0x1000>;