Merge branch 'next/soc2' into for-next

* next/soc2:
  ARM: configs: keystone: enable reset driver support
  ARM: dts: keystone: update reset node to work with reset driver
  ARM: keystone: remove redundant reset stuff

diff --cc arch/arm/boot/dts/keystone.dtsi
index d9f99e7deb83d6da54af0a0fa911b8b1134adf2b,a8052fd657e56b5e65c6d51c64a01c127c728377..c1414cb81fd4ac8e2a58a513e5e0b5fe08a6aeb9
--- 1/arch/arm/boot/dts/keystone.dtsi
--- 2/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@@ -64,11 -66,22 +64,23 @@@
                compatible = "ti,keystone","simple-bus";
                interrupt-parent = <&gic>;
                ranges = <0x0 0x0 0x0 0xc0000000>;
 +              dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
  
+               pllctrl: pll-controller@02310000 {
+                       compatible = "ti,keystone-pllctrl", "syscon";
+                       reg = <0x02310000 0x200>;
+               };
+ 
+               devctrl: device-state-control@02620000 {
+                       compatible = "ti,keystone-devctrl", "syscon";
+                       reg = <0x02620000 0x1000>;
+               };
+ 
                rstctrl: reset-controller {
                        compatible = "ti,keystone-reset";
-                       reg = <0x023100e8 4>;   /* pll reset control reg */
+                       ti,syscon-pll = <&pllctrl 0xe4>;
+                       ti,syscon-dev = <&devctrl 0x328>;
+                       ti,wdt-list = <0>;
                };
  
                /include/ "keystone-clocks.dtsi"