summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorIvan Khoronzhuk <ivan.khoronzhuk@ti.com>2014-05-23 16:34:55 -0400
committerSantosh Shilimkar <santosh.shilimkar@ti.com>2014-05-27 09:48:52 -0400
commitded79bebcace01c803c8b71871fd13c90ca5cffd (patch)
tree873a67a19479096e1a806cb04cca7505382c4309 /arch/arm
parentb7ae8bf7bf3c9db304aa582e5c26fc74ae636998 (diff)
downloadlinux-stable-ded79bebcace01c803c8b71871fd13c90ca5cffd.tar.gz
linux-stable-ded79bebcace01c803c8b71871fd13c90ca5cffd.tar.bz2
linux-stable-ded79bebcace01c803c8b71871fd13c90ca5cffd.zip
ARM: dts: keystone: update reset node to work with reset driver
The pll controller register set and device state control registers include sets of registers with different purposes, so it's logically to add syscon entry to be able to access them from appropriate places. So added pll controller and device state control syscon entries. The keystone driver requires the next additional properties: "ti,syscon-pll" - phandle/offset pair. The phandle to syscon used to access pll controller registers and the offset to use reset control registers. "ti,syscon-dev" - phandle/offset pair. The phandle to syscon used to access device state control registers and the offset in order to use mux block registers for all watchdogs. "ti,wdt-list" - option to declare what watchdogs are used to reboot the SoC, so set "0" WDT as default. Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/keystone.dtsi14
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index 90823eb90c1b..a8052fd657e5 100644
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -67,9 +67,21 @@
interrupt-parent = <&gic>;
ranges = <0x0 0x0 0x0 0xc0000000>;
+ 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"