diff options
author | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 10:58:57 -0500 |
---|---|---|
committer | Mike Marshall <hubcap@omnibond.com> | 2015-11-16 10:58:57 -0500 |
commit | a52079dad4718fa924ae81a939f8a665366f562b (patch) | |
tree | a9d6004f9bf1beff49cbfe0d5bf6edbf621b065d /Documentation/devicetree/bindings/clock/st/st,clkgen-pll.txt | |
parent | 24c8d0804be00da90af9efa8eb404bd7a3284ba9 (diff) | |
parent | 8005c49d9aea74d382f474ce11afbbc7d7130bec (diff) | |
download | linux-a52079dad4718fa924ae81a939f8a665366f562b.tar.gz linux-a52079dad4718fa924ae81a939f8a665366f562b.tar.bz2 linux-a52079dad4718fa924ae81a939f8a665366f562b.zip |
Orangefs: Merge tag 'v4.4-rc1' into for-next
Linux 4.4-rc1
Diffstat (limited to 'Documentation/devicetree/bindings/clock/st/st,clkgen-pll.txt')
-rw-r--r-- | Documentation/devicetree/bindings/clock/st/st,clkgen-pll.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/st/st,clkgen-pll.txt b/Documentation/devicetree/bindings/clock/st/st,clkgen-pll.txt index d8b168ebd5f1..844b3a0976bf 100644 --- a/Documentation/devicetree/bindings/clock/st/st,clkgen-pll.txt +++ b/Documentation/devicetree/bindings/clock/st/st,clkgen-pll.txt @@ -23,6 +23,7 @@ Required properties: "st,stih407-plls-c32-a9", "st,clkgen-plls-c32" "sst,plls-c32-cx_0", "st,clkgen-plls-c32" "sst,plls-c32-cx_1", "st,clkgen-plls-c32" + "st,stih418-plls-c28-a9", "st,clkgen-plls-c32" "st,stih415-gpu-pll-c32", "st,clkgengpu-pll-c32" "st,stih416-gpu-pll-c32", "st,clkgengpu-pll-c32" |