Merge "clk: qcom: Add support for clk_set_flags for branch and dummy clock"

1 files changed, 5 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/arm/msm/clock-controller-dummy.txt b/Documentation/devicetree/bindings/arm/msm/clock-controller-dummy.txt
index fff8c9e20a1b..c6db837fa137 100644
--- a/Documentation/devicetree/bindings/arm/msm/clock-controller-dummy.txt
+++ b/Documentation/devicetree/bindings/arm/msm/clock-controller-dummy.txt
@@ -9,9 +9,14 @@ Required properties:
 - #clock_cells:		Must be <1>. This will allow the common clock device
 			tree framework to recognize _this_ device node as a
 			clock provider.
+Optional properties:
+- #reset-cells:		Must be <1>. This will allow the common reset device
+			tree framework to recognize _this_ device node as a
+			reset controller provider.
 
 Example:
 	clock_rpm: qcom,rpmcc {
 		compatible = "qcom,dummycc";
 		#clock-cells = <1>;
+		#reset-cells = <1>;
 	};