diff options
| author | Olof Johansson | 2014-05-27 20:11:17 +0200 |
|---|---|---|
| committer | Olof Johansson | 2014-05-27 20:11:17 +0200 |
| commit | 9eb23c9218aac6ff4b5c2e660638a47c03f2c978 (patch) | |
| tree | f4368560d7b74d94fe64028ead84ba9963cd3182 /arch/arm/boot | |
| parent | Merge tag 'keystone-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/ssa... (diff) | |
| parent | ARM: configs: keystone: enable reset driver support (diff) | |
| download | kernel-qcow2-linux-9eb23c9218aac6ff4b5c2e660638a47c03f2c978.tar.gz kernel-qcow2-linux-9eb23c9218aac6ff4b5c2e660638a47c03f2c978.tar.xz kernel-qcow2-linux-9eb23c9218aac6ff4b5c2e660638a47c03f2c978.zip | |
Merge tag 'keystone-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/soc2
Merge "Keystone SOC updates part2 for 3.16" from Santosh Shilimkar:
- Removal of now un-necessary reset machine code
- dts updates for keystone reset driver
* tag 'keystone-soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
ARM: configs: keystone: enable reset driver support
ARM: dts: keystone: update reset node to work with reset driver
ARM: keystone: remove redundant reset stuff
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/keystone.dtsi | 14 |
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" |