diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 22:49:14 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 22:49:14 +0100 |
| commit | 2ada9593224ccc0f6a9368778dc55a59b92aff10 (patch) | |
| tree | fa791c9c6a17200108ff52da3bf273e7ad417004 /Documentation/devicetree/bindings/firmware | |
| parent | ba9cb7b9ffa4a4056158bc8570f1a851e4a6a8ae (diff) | |
| parent | ed19b86e817c5f30d557042f2e8ab68dc93940d4 (diff) | |
Merge tag 'qcom-drivers-for-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers
Pull "Qualcomm ARM Based Driver Updates for v4.10 - Part 2" from Andy Gross:
* Fixup QCOM SCM to support MSM8996
* tag 'qcom-drivers-for-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
firmware: qcom: scm: Return PTR_ERR when devm_clk_get fails
firmware: qcom: scm: Remove core, iface and bus clocks dependency
dt-bindings: firmware: scm: Add MSM8996 DT bindings
Diffstat (limited to 'Documentation/devicetree/bindings/firmware')
| -rw-r--r-- | Documentation/devicetree/bindings/firmware/qcom,scm.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.txt b/Documentation/devicetree/bindings/firmware/qcom,scm.txt index 3b4436e56865..20f26fbce875 100644 --- a/Documentation/devicetree/bindings/firmware/qcom,scm.txt +++ b/Documentation/devicetree/bindings/firmware/qcom,scm.txt @@ -10,8 +10,10 @@ Required properties: * "qcom,scm-apq8064" for APQ8064 platforms * "qcom,scm-msm8660" for MSM8660 platforms * "qcom,scm-msm8690" for MSM8690 platforms + * "qcom,scm-msm8996" for MSM8996 platforms * "qcom,scm" for later processors (MSM8916, APQ8084, MSM8974, etc) - clocks: One to three clocks may be required based on compatible. + * No clock required for "qcom,scm-msm8996" * Only core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660", and "qcom,scm-msm8960" * Core, iface, and bus clocks required for "qcom,scm" - clock-names: Must contain "core" for the core clock, "iface" for the interface |