summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/clock
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2016-01-29 16:35:02 -0800
committerStephen Boyd <sboyd@codeaurora.org>2016-01-29 16:35:02 -0800
commit4c9f242203d83838ca412eaeb70dfad6531b9a4d (patch)
tree35dec1bf40085f9a91a961291e287c7f4b8213e2 /Documentation/devicetree/bindings/clock
parentb9e65ebc654dffeb77d8ef878bd6b2da30c55a94 (diff)
parentdf416e565d6e1d18cfa3b5e016a667bf51ce6aac (diff)
downloadlinux-stable-4c9f242203d83838ca412eaeb70dfad6531b9a4d.tar.gz
linux-stable-4c9f242203d83838ca412eaeb70dfad6531b9a4d.tar.bz2
linux-stable-4c9f242203d83838ca412eaeb70dfad6531b9a4d.zip
Merge branch 'clk-iproc' into clk-next
* clk-iproc: clk: iproc: Remove __init from header clk: iproc: Add support for Cygnus audio clocks Documentation: dt-bindings: Add DT bindings for Cygnus audio clock
Diffstat (limited to 'Documentation/devicetree/bindings/clock')
-rw-r--r--Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
index 0b35e71b39e8..6f66e9aa354c 100644
--- a/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/brcm,iproc-clocks.txt
@@ -92,6 +92,7 @@ PLL and leaf clock compatible strings for Cygnus are:
"brcm,cygnus-lcpll0"
"brcm,cygnus-mipipll"
"brcm,cygnus-asiu-clk"
+ "brcm,cygnus-audiopll"
The following table defines the set of PLL/clock index and ID for Cygnus.
These clock IDs are defined in:
@@ -131,6 +132,11 @@ These clock IDs are defined in:
ch4_unused mipipll 5 BCM_CYGNUS_MIPIPLL_CH4_UNUSED
ch5_unused mipipll 6 BCM_CYGNUS_MIPIPLL_CH5_UNUSED
+ audiopll crystal 0 BCM_CYGNUS_AUDIOPLL
+ ch0_audio audiopll 1 BCM_CYGNUS_AUDIOPLL_CH0
+ ch1_audio audiopll 2 BCM_CYGNUS_AUDIOPLL_CH1
+ ch2_audio audiopll 3 BCM_CYGNUS_AUDIOPLL_CH2
+
Northstar and Northstar Plus
------
PLL and leaf clock compatible strings for Northstar and Northstar Plus are: