diff options
author | Michael Turquette <mturquette@baylibre.com> | 2015-06-18 14:17:35 -0700 |
---|---|---|
committer | Michael Turquette <mturquette@baylibre.com> | 2015-06-18 14:17:35 -0700 |
commit | 91990d213ca06fdecca19e10514ebec7c89ddca9 (patch) | |
tree | 1d21d31769aeac649f9723dc8add71a663abbc7b /Documentation | |
parent | dc627eea98b1e12f9ff2ecd241a34a2056fdddbd (diff) | |
parent | ec80749dfd859b560e8864d665d38d7a63e6a7f2 (diff) | |
download | linux-91990d213ca06fdecca19e10514ebec7c89ddca9.tar.gz linux-91990d213ca06fdecca19e10514ebec7c89ddca9.tar.bz2 linux-91990d213ca06fdecca19e10514ebec7c89ddca9.zip |
Merge tag 'sunxi-clocks-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next
Allwinner clocks additions for 4.2
One error fix, and one patch to add support for the USB clock found on the
Allwinner A23 and A33
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt index 4fa11af3d378..8a47b77abfca 100644 --- a/Documentation/devicetree/bindings/clock/sunxi.txt +++ b/Documentation/devicetree/bindings/clock/sunxi.txt @@ -67,6 +67,7 @@ Required properties: "allwinner,sun4i-a10-usb-clk" - for usb gates + resets on A10 / A20 "allwinner,sun5i-a13-usb-clk" - for usb gates + resets on A13 "allwinner,sun6i-a31-usb-clk" - for usb gates + resets on A31 + "allwinner,sun8i-a23-usb-clk" - for usb gates + resets on A23 "allwinner,sun9i-a80-usb-mod-clk" - for usb gates + resets on A80 "allwinner,sun9i-a80-usb-phy-clk" - for usb phy gates + resets on A80 |