diff options
author | Mike Turquette <mturquette@linaro.org> | 2014-07-25 20:45:30 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-07-25 20:45:30 -0400 |
commit | 3cc5aba4158e757ddd33751db6ca1729741e8dba (patch) | |
tree | 603de23aec889afde3080dbccd8090a0cba8ceff /Documentation | |
parent | 9ae1400588a114be908bcf650aa57309c1a508ed (diff) | |
parent | 6c1d66f0da59362cb33ce37d436cd28c77c2b2cb (diff) |
Merge tag 'sunxi-clocks-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next-sunxi
Allwinner clocks additions for 3.17
This pull request adds support for the clocks found in the newly supported
Allwinner A23 clocks.
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt index b9ec668bfe62..d3a5c3c6d677 100644 --- a/Documentation/devicetree/bindings/clock/sunxi.txt +++ b/Documentation/devicetree/bindings/clock/sunxi.txt | |||
@@ -9,11 +9,13 @@ Required properties: | |||
9 | "allwinner,sun4i-a10-osc-clk" - for a gatable oscillator | 9 | "allwinner,sun4i-a10-osc-clk" - for a gatable oscillator |
10 | "allwinner,sun4i-a10-pll1-clk" - for the main PLL clock and PLL4 | 10 | "allwinner,sun4i-a10-pll1-clk" - for the main PLL clock and PLL4 |
11 | "allwinner,sun6i-a31-pll1-clk" - for the main PLL clock on A31 | 11 | "allwinner,sun6i-a31-pll1-clk" - for the main PLL clock on A31 |
12 | "allwinner,sun8i-a23-pll1-clk" - for the main PLL clock on A23 | ||
12 | "allwinner,sun4i-a10-pll5-clk" - for the PLL5 clock | 13 | "allwinner,sun4i-a10-pll5-clk" - for the PLL5 clock |
13 | "allwinner,sun4i-a10-pll6-clk" - for the PLL6 clock | 14 | "allwinner,sun4i-a10-pll6-clk" - for the PLL6 clock |
14 | "allwinner,sun6i-a31-pll6-clk" - for the PLL6 clock on A31 | 15 | "allwinner,sun6i-a31-pll6-clk" - for the PLL6 clock on A31 |
15 | "allwinner,sun4i-a10-cpu-clk" - for the CPU multiplexer clock | 16 | "allwinner,sun4i-a10-cpu-clk" - for the CPU multiplexer clock |
16 | "allwinner,sun4i-a10-axi-clk" - for the AXI clock | 17 | "allwinner,sun4i-a10-axi-clk" - for the AXI clock |
18 | "allwinner,sun8i-a23-axi-clk" - for the AXI clock on A23 | ||
17 | "allwinner,sun4i-a10-axi-gates-clk" - for the AXI gates | 19 | "allwinner,sun4i-a10-axi-gates-clk" - for the AXI gates |
18 | "allwinner,sun4i-a10-ahb-clk" - for the AHB clock | 20 | "allwinner,sun4i-a10-ahb-clk" - for the AHB clock |
19 | "allwinner,sun4i-a10-ahb-gates-clk" - for the AHB gates on A10 | 21 | "allwinner,sun4i-a10-ahb-gates-clk" - for the AHB gates on A10 |
@@ -23,13 +25,16 @@ Required properties: | |||
23 | "allwinner,sun6i-a31-ar100-clk" - for the AR100 on A31 | 25 | "allwinner,sun6i-a31-ar100-clk" - for the AR100 on A31 |
24 | "allwinner,sun6i-a31-ahb1-mux-clk" - for the AHB1 multiplexer on A31 | 26 | "allwinner,sun6i-a31-ahb1-mux-clk" - for the AHB1 multiplexer on A31 |
25 | "allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31 | 27 | "allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31 |
28 | "allwinner,sun8i-a23-ahb1-gates-clk" - for the AHB1 gates on A23 | ||
26 | "allwinner,sun4i-a10-apb0-clk" - for the APB0 clock | 29 | "allwinner,sun4i-a10-apb0-clk" - for the APB0 clock |
27 | "allwinner,sun6i-a31-apb0-clk" - for the APB0 clock on A31 | 30 | "allwinner,sun6i-a31-apb0-clk" - for the APB0 clock on A31 |
31 | "allwinner,sun8i-a23-apb0-clk" - for the APB0 clock on A23 | ||
28 | "allwinner,sun4i-a10-apb0-gates-clk" - for the APB0 gates on A10 | 32 | "allwinner,sun4i-a10-apb0-gates-clk" - for the APB0 gates on A10 |
29 | "allwinner,sun5i-a13-apb0-gates-clk" - for the APB0 gates on A13 | 33 | "allwinner,sun5i-a13-apb0-gates-clk" - for the APB0 gates on A13 |
30 | "allwinner,sun5i-a10s-apb0-gates-clk" - for the APB0 gates on A10s | 34 | "allwinner,sun5i-a10s-apb0-gates-clk" - for the APB0 gates on A10s |
31 | "allwinner,sun6i-a31-apb0-gates-clk" - for the APB0 gates on A31 | 35 | "allwinner,sun6i-a31-apb0-gates-clk" - for the APB0 gates on A31 |
32 | "allwinner,sun7i-a20-apb0-gates-clk" - for the APB0 gates on A20 | 36 | "allwinner,sun7i-a20-apb0-gates-clk" - for the APB0 gates on A20 |
37 | "allwinner,sun8i-a23-apb0-gates-clk" - for the APB0 gates on A23 | ||
33 | "allwinner,sun4i-a10-apb1-clk" - for the APB1 clock | 38 | "allwinner,sun4i-a10-apb1-clk" - for the APB1 clock |
34 | "allwinner,sun4i-a10-apb1-mux-clk" - for the APB1 clock muxing | 39 | "allwinner,sun4i-a10-apb1-mux-clk" - for the APB1 clock muxing |
35 | "allwinner,sun4i-a10-apb1-gates-clk" - for the APB1 gates on A10 | 40 | "allwinner,sun4i-a10-apb1-gates-clk" - for the APB1 gates on A10 |
@@ -37,8 +42,10 @@ Required properties: | |||
37 | "allwinner,sun5i-a10s-apb1-gates-clk" - for the APB1 gates on A10s | 42 | "allwinner,sun5i-a10s-apb1-gates-clk" - for the APB1 gates on A10s |
38 | "allwinner,sun6i-a31-apb1-gates-clk" - for the APB1 gates on A31 | 43 | "allwinner,sun6i-a31-apb1-gates-clk" - for the APB1 gates on A31 |
39 | "allwinner,sun7i-a20-apb1-gates-clk" - for the APB1 gates on A20 | 44 | "allwinner,sun7i-a20-apb1-gates-clk" - for the APB1 gates on A20 |
45 | "allwinner,sun8i-a23-apb1-gates-clk" - for the APB1 gates on A23 | ||
40 | "allwinner,sun6i-a31-apb2-div-clk" - for the APB2 gates on A31 | 46 | "allwinner,sun6i-a31-apb2-div-clk" - for the APB2 gates on A31 |
41 | "allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31 | 47 | "allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31 |
48 | "allwinner,sun8i-a23-apb2-gates-clk" - for the APB2 gates on A23 | ||
42 | "allwinner,sun4i-a10-mod0-clk" - for the module 0 family of clocks | 49 | "allwinner,sun4i-a10-mod0-clk" - for the module 0 family of clocks |
43 | "allwinner,sun7i-a20-out-clk" - for the external output clocks | 50 | "allwinner,sun7i-a20-out-clk" - for the external output clocks |
44 | "allwinner,sun7i-a20-gmac-clk" - for the GMAC clock module on A20/A31 | 51 | "allwinner,sun7i-a20-gmac-clk" - for the GMAC clock module on A20/A31 |