Merge branch 'omap-for-v4.1/prcm-cleanup' into for-next

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

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

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

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

diff --cc arch/arm/boot/dts/omap3.dtsi
index 3fdc84fddb70d06a2ae26db02fc2c9c9f6d8ee63,b28791ade27a4130ebd7b0371060f61ef8c1f93d..d18a90f5eca3145e527926a5d2bbbb44c2d8b1c0
--- 1/arch/arm/boot/dts/omap3.dtsi
--- 2/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@@ -157,37 -196,10 +198,10 @@@
                                     <14>,
                                     <15>;
                        #dma-cells = <1>;
 -                      #dma-channels = <32>;
 -                      #dma-requests = <96>;
 +                      dma-channels = <32>;
 +                      dma-requests = <96>;
                };
  
-               omap3_pmx_core: pinmux@48002030 {
-                       compatible = "ti,omap3-padconf", "pinctrl-single";
-                       reg = <0x48002030 0x0238>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       #interrupt-cells = <1>;
-                       interrupt-controller;
-                       pinctrl-single,register-width = <16>;
-                       pinctrl-single,function-mask = <0xff1f>;
-               };
- 
-               omap3_pmx_wkup: pinmux@48002a00 {
-                       compatible = "ti,omap3-padconf", "pinctrl-single";
-                       reg = <0x48002a00 0x5c>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       #interrupt-cells = <1>;
-                       interrupt-controller;
-                       pinctrl-single,register-width = <16>;
-                       pinctrl-single,function-mask = <0xff1f>;
-               };
- 
-               omap3_scm_general: tisyscon@48002270 {
-                       compatible = "syscon";
-                       reg = <0x48002270 0x2f0>;
-               };
- 
                pbias_regulator: pbias_regulator {
                        compatible = "ti,pbias-omap";
                        reg = <0x2b0 0x4>;

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

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

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

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