diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-12-01 00:00:48 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-12-01 00:00:48 -0800 |
| commit | 0b9ddcc84eba3309a42fd73d293cc5df79e911b4 (patch) | |
| tree | a62fa7a707ce96378a63301fdd8150844f2d49c8 /Documentation/devicetree/bindings/clock | |
| parent | 64dfbe240f47f672957ff0fadf98583f0412e7e6 (diff) | |
| parent | c252659770db6b00817f7c007a68a04e0d0395ad (diff) | |
| download | linux-0b9ddcc84eba3309a42fd73d293cc5df79e911b4.tar.gz linux-0b9ddcc84eba3309a42fd73d293cc5df79e911b4.tar.bz2 linux-0b9ddcc84eba3309a42fd73d293cc5df79e911b4.zip | |
Merge branch 'clk-msm8996' into clk-next
* clk-msm8996:
clk: qcom: Add MSM8996 Multimedia Clock Controller (MMCC) driver
clk: qcom: Add gfx3d ping-pong PLL frequency switching
clk: qcom: Add MSM8996 Global Clock Control (GCC) driver
clk: qcom: Add Alpha PLL support
clk: divider: Cap table divider values to 'width' member
Diffstat (limited to 'Documentation/devicetree/bindings/clock')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/qcom,gcc.txt | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/clock/qcom,mmcc.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt b/Documentation/devicetree/bindings/clock/qcom,gcc.txt index 152dfaab2575..72f82f444091 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt +++ b/Documentation/devicetree/bindings/clock/qcom,gcc.txt @@ -13,6 +13,7 @@ Required properties : "qcom,gcc-msm8974" "qcom,gcc-msm8974pro" "qcom,gcc-msm8974pro-ac" + "qcom,gcc-msm8996" - reg : shall contain base register location and length - #clock-cells : shall contain 1 diff --git a/Documentation/devicetree/bindings/clock/qcom,mmcc.txt b/Documentation/devicetree/bindings/clock/qcom,mmcc.txt index 34e7614d5074..8b0f7841af8d 100644 --- a/Documentation/devicetree/bindings/clock/qcom,mmcc.txt +++ b/Documentation/devicetree/bindings/clock/qcom,mmcc.txt @@ -9,6 +9,7 @@ Required properties : "qcom,mmcc-msm8660" "qcom,mmcc-msm8960" "qcom,mmcc-msm8974" + "qcom,mmcc-msm8996" - reg : shall contain base register location and length - #clock-cells : shall contain 1 |