From: Olof Johansson <olof@lixom.net>
Date: Tue, 27 May 2014 18:13:05 +0000 (-0700)
Subject: Merge branch 'next/soc2' into for-next
X-Git-Tag: next-20140530~119^2~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=169722864588ac45d8c545745fdc760fe0b47b0b;p=karo-tx-linux.git

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
---

169722864588ac45d8c545745fdc760fe0b47b0b
diff --cc arch/arm/boot/dts/keystone.dtsi
index d9f99e7deb83,a8052fd657e5..c1414cb81fd4
--- a/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"