MSM8960 shares the design (and the driver) of the global clock controller. Move it from clock/qcom,gcc-other.yaml to clock/qcom,gcc-apq8064.yaml. As the eaxmple in gcc-other.yaml was using the msm8960 compat string, change it to qcom,gcc-msm8660. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> --- .../devicetree/bindings/clock/qcom,gcc-apq8064.yaml | 6 ++++-- Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml index 9fafcb080069..bd7b04c75e50 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml @@ -4,7 +4,7 @@ $id: http://devicetree.org/schemas/clock/qcom,gcc-apq8064.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm Global Clock & Reset Controller Binding for APQ8064 +title: Qualcomm Global Clock & Reset Controller Binding for APQ8064/MSM8960 allOf: - $ref: qcom,gcc.yaml# @@ -23,7 +23,9 @@ description: | properties: compatible: - const: qcom,gcc-apq8064 + enum: + - qcom,gcc-apq8064 + - qcom,gcc-msm8960 nvmem-cells: minItems: 1 diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml index 142402f29d98..9c69083bd93e 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml @@ -47,7 +47,6 @@ properties: - qcom,gcc-msm8916 - qcom,gcc-msm8939 - qcom,gcc-msm8953 - - qcom,gcc-msm8960 - qcom,gcc-msm8974 - qcom,gcc-msm8974pro - qcom,gcc-msm8974pro-ac @@ -61,10 +60,10 @@ required: unevaluatedProperties: false examples: - # Example for GCC for MSM8960: + # Example for GCC for MSM8660: - | clock-controller@900000 { - compatible = "qcom,gcc-msm8960"; + compatible = "qcom,gcc-msm8660"; reg = <0x900000 0x4000>; #clock-cells = <1>; #reset-cells = <1>; -- 2.35.1
