summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-04-26 11:29:30 +0200
committerArnd Bergmann <arnd@arndb.de>2014-04-26 11:29:30 +0200
commit12e8e5952598714faa6f202ab028bcd291337cce (patch)
treebba92ecf29110bd779888aa21d6270866651a2e4 /Documentation
parent76e7745e8e4330fdb30f049303d524261c0b7a2c (diff)
parent35d35aae817706800a4913711d563a99e1dc380a (diff)
downloadop-kernel-dev-12e8e5952598714faa6f202ab028bcd291337cce.zip
op-kernel-dev-12e8e5952598714faa6f202ab028bcd291337cce.tar.gz
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
3.15 fixes for AT91 - one little DT fix - the use of proper directory for clock in include/dt-bindings it allows to remove the now empty include/dt-bindings/clk * tag 'at91-fixes' of git://github.com/at91linux/linux-at91: dt-bindings: clock: Move at91.h to dt-bindigs/clock ARM: at91: fix spi cs on sama5d3 Xplained board Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/clock/at91-clock.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/at91-clock.txt b/Documentation/devicetree/bindings/clock/at91-clock.txt
index cd5e239..6794cdc 100644
--- a/Documentation/devicetree/bindings/clock/at91-clock.txt
+++ b/Documentation/devicetree/bindings/clock/at91-clock.txt
@@ -62,7 +62,7 @@ Required properties for PMC node:
- interrupt-controller : tell that the PMC is an interrupt controller.
- #interrupt-cells : must be set to 1. The first cell encodes the interrupt id,
and reflect the bit position in the PMC_ER/DR/SR registers.
- You can use the dt macros defined in dt-bindings/clk/at91.h.
+ You can use the dt macros defined in dt-bindings/clock/at91.h.
0 (AT91_PMC_MOSCS) -> main oscillator ready
1 (AT91_PMC_LOCKA) -> PLL A ready
2 (AT91_PMC_LOCKB) -> PLL B ready
OpenPOWER on IntegriCloud