diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 23:02:49 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 23:02:49 +0200 |
commit | 77579afc35eeea20d3b34aad66dcbb6fdaf502da (patch) | |
tree | b640c86b4fee33493e5ea44633b8713c3e98c78c /Documentation/devicetree | |
parent | d5cd8605e2814d268cddee1ff1d95d9010b4e8eb (diff) | |
parent | b4a86b3810f5dc4b959ee69a3818c876752c88cd (diff) |
Merge tag 'at91-dt3' of git://github.com/at91linux/linux-at91 into next/dt
3.16 third DT series:
- move of both at91sam9n12 and at91sam9x5 to CCF
* tag 'at91-dt3' of git://github.com/at91linux/linux-at91:
ARM: at91: move sam9n12 SoC to the CCF
ARM: at91/dt: define sam9n12ek crystal frequencies
ARM: at91/dt: define sam9n12 clocks
ARM: at91: prepare common clk transition for sam9n12 SoC
ARM: at91: move sam9x5 SoCs to the CCF
ARM: at91/dt: define sam9x5ek's crystal frequencies
ARM: at91/dt: define sam9x5 clocks
ARM: at91: prepare common clk transition for sam9x5 SoCs
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/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/clock/at91-clock.txt | 2 |
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 27f9a27bb754..b3d544ca522a 100644 --- a/Documentation/devicetree/bindings/clock/at91-clock.txt +++ b/Documentation/devicetree/bindings/clock/at91-clock.txt @@ -139,7 +139,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 |