diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-09-27 12:52:33 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-09-27 12:52:33 -0700 |
| commit | 4dc7ed32f398fa76b9e1d243a852420b1dad0150 (patch) | |
| tree | a040f8c006ea7a7a3c962f135c8efd8b72cbc4b4 /Documentation | |
| parent | 5ad67d3e5e0a5059945a7726a407763a23f80d9e (diff) | |
| parent | 9c8176bfb67f98ed9a521b624dcb6ab7fa254aa7 (diff) | |
| download | op-kernel-dev-4dc7ed32f398fa76b9e1d243a852420b1dad0150.zip op-kernel-dev-4dc7ed32f398fa76b9e1d243a852420b1dad0150.tar.gz | |
Merge tag 'sunxi-clocks-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next
Allwinner Clocks Additions for 3.18
The most important part of this serie is the addition of the phase API to
handle the MMC clocks in the Allwinner SoCs.
Apart from that, the A23 gained a new mbus driver, and there's a fix for a
incorrect divider table on the APB0 clock.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt index d3a5c3c..ed116df 100644 --- a/Documentation/devicetree/bindings/clock/sunxi.txt +++ b/Documentation/devicetree/bindings/clock/sunxi.txt @@ -46,7 +46,11 @@ Required properties: "allwinner,sun6i-a31-apb2-div-clk" - for the APB2 gates on A31 "allwinner,sun6i-a31-apb2-gates-clk" - for the APB2 gates on A31 "allwinner,sun8i-a23-apb2-gates-clk" - for the APB2 gates on A23 + "allwinner,sun5i-a13-mbus-clk" - for the MBUS clock on A13 + "allwinner,sun4i-a10-mmc-output-clk" - for the MMC output clock on A10 + "allwinner,sun4i-a10-mmc-sample-clk" - for the MMC sample clock on A10 "allwinner,sun4i-a10-mod0-clk" - for the module 0 family of clocks + "allwinner,sun8i-a23-mbus-clk" - for the MBUS clock on A23 "allwinner,sun7i-a20-out-clk" - for the external output clocks "allwinner,sun7i-a20-gmac-clk" - for the GMAC clock module on A20/A31 "allwinner,sun4i-a10-usb-clk" - for usb gates + resets on A10 / A20 |
