diff options
author | Mike Turquette <mturquette@linaro.org> | 2014-03-19 05:34:45 +0100 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-03-19 05:34:45 +0100 |
commit | 06fa5ab32a1b246bf151edddf9aa5580d4021d92 (patch) | |
tree | bd54f7e93da03be4c5043eb8c616559895116b0e /Documentation | |
parent | clk: clk-s2mps11: Add support for clocks in S5M8767 MFD (diff) | |
parent | clk: mvebu: Update binding documentation for the core divider clock (diff) | |
download | linux-06fa5ab32a1b246bf151edddf9aa5580d4021d92.tar.xz linux-06fa5ab32a1b246bf151edddf9aa5580d4021d92.zip |
Merge tag 'clk-mvebu-3xx-3.15-2' of git://git.infradead.org/linux-mvebu into clk-next-mvebu
clock: mvebu new SoC changes for v3.15 (incremental pull #2)
- mvebu (Armada 375)
- fix ratio register offest
- mvebu (Armada 380)
- expand core divider clock driver to support 380 SoC (enables nand support)
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt b/Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt index c62391fc0e39..520562a7dc2a 100644 --- a/Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt +++ b/Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt @@ -4,7 +4,10 @@ The following is a list of provided IDs and clock names on Armada 370/XP: 0 = nand (NAND clock) Required properties: -- compatible : must be "marvell,armada-370-corediv-clock" +- compatible : must be "marvell,armada-370-corediv-clock", + "marvell,armada-375-corediv-clock", + "marvell,armada-380-corediv-clock", + - reg : must be the register address of Core Divider control register - #clock-cells : from common clock binding; shall be set to 1 - clocks : must be set to the parent's phandle |