summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorEmilio López <emilio@elopez.com.ar>2014-11-06 04:40:29 +0100
committerMaxime Ripard <maxime.ripard@free-electrons.com>2014-11-11 15:54:40 +0100
commit93746e70be83a3f113134a16065957b324af50f7 (patch)
tree8f8c26ba9d3a9bc335b30963a6cd6d7caecde7dd /Documentation
parentclk: sunxi: Add support for bus clock gates on Allwinner A80 SoC (diff)
downloadlinux-93746e70be83a3f113134a16065957b324af50f7.tar.xz
linux-93746e70be83a3f113134a16065957b324af50f7.zip
clk: sunxi: unify APB1 clock
This commit unifies the APB1 mux with the APB1 clock, using the new factors infrastructure. Signed-off-by: Emilio López <emilio@elopez.com.ar> [wens@csie.org: Add mux mask bits] Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/clock/sunxi.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt
index 0455cb9caa97..6ddcf6e10eb8 100644
--- a/Documentation/devicetree/bindings/clock/sunxi.txt
+++ b/Documentation/devicetree/bindings/clock/sunxi.txt
@@ -45,7 +45,6 @@ Required properties:
"allwinner,sun9i-a80-apb0-gates-clk" - for the APB0 gates on A80
"allwinner,sun4i-a10-apb1-clk" - for the APB1 clock
"allwinner,sun9i-a80-apb1-clk" - for the APB1 bus clock on A80
- "allwinner,sun4i-a10-apb1-mux-clk" - for the APB1 clock muxing
"allwinner,sun4i-a10-apb1-gates-clk" - for the APB1 gates on A10
"allwinner,sun5i-a13-apb1-gates-clk" - for the APB1 gates on A13
"allwinner,sun5i-a10s-apb1-gates-clk" - for the APB1 gates on A10s