diff options
author | Michal Marek <mmarek@suse.cz> | 2013-02-25 21:50:05 +0100 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2013-02-25 21:51:57 +0100 |
commit | e3900e74f26fc924c8e9e2a922bd40369b0bb517 (patch) | |
tree | 6e868575d346032ba9408f350c6e5369e0e52b0d /Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt | |
parent | kbuild: Fix missing '\n' for NEW symbols in yes "" | make oldconfig >conf.new (diff) | |
parent | Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes (diff) | |
download | linux-dev-e3900e74f26fc924c8e9e2a922bd40369b0bb517.tar.xz linux-dev-e3900e74f26fc924c8e9e2a922bd40369b0bb517.zip |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
There is one kconfig fix in the rc-fixes branch that I forgot to submit
for 3.8, so let's add it to the kconfig branch for 3.9-rc1.
Diffstat (limited to 'Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt')
-rw-r--r-- | Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt b/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt index 8b6ea2267c94..64830118b013 100644 --- a/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt +++ b/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt @@ -5,6 +5,7 @@ Required properties: - compatible: Should be "marvell,armada-370-xp-timer" - interrupts: Should contain the list of Global Timer interrupts - reg: Should contain the base address of the Global Timer registers +- clocks: clock driving the timer hardware Optional properties: - marvell,timer-25Mhz: Tells whether the Global timer supports the 25 |