summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/clock/sunxi.txt
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-01-08 11:34:49 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2015-01-08 11:34:49 +1100
commit7b1b6da05a655fc714c0f5fe2f26e1b8abef140d (patch)
tree94bffc49b6781b4f46ca30115135f3183b834130 /Documentation/devicetree/bindings/clock/sunxi.txt
parent5f3d88ba74d410f811e2942a38063f23c2037a49 (diff)
parent1363ad23197bd38e0e2c75a6b9a95854346da815 (diff)
Merge remote-tracking branch 'sunxi/sunxi/for-next'
Diffstat (limited to 'Documentation/devicetree/bindings/clock/sunxi.txt')
-rw-r--r--Documentation/devicetree/bindings/clock/sunxi.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt
index 67b2b99f2b33..9dc4f55a04ad 100644
--- a/Documentation/devicetree/bindings/clock/sunxi.txt
+++ b/Documentation/devicetree/bindings/clock/sunxi.txt
@@ -26,7 +26,7 @@ Required properties:
"allwinner,sun5i-a10s-ahb-gates-clk" - for the AHB gates on A10s
"allwinner,sun7i-a20-ahb-gates-clk" - for the AHB gates on A20
"allwinner,sun6i-a31-ar100-clk" - for the AR100 on A31
- "allwinner,sun6i-a31-ahb1-mux-clk" - for the AHB1 multiplexer on A31
+ "allwinner,sun6i-a31-ahb1-clk" - for the AHB1 clock on A31
"allwinner,sun6i-a31-ahb1-gates-clk" - for the AHB1 gates on A31
"allwinner,sun8i-a23-ahb1-gates-clk" - for the AHB1 gates on A23
"allwinner,sun9i-a80-ahb0-gates-clk" - for the AHB0 gates on A80