[PATCH v2 0/2] dt-bindings: clock: sourt out gcc-apq8064 compats

[PATCH v2 0/2] dt-bindings: clock: sourt out gcc-apq8064 compats

[Dmitry Baryshkov]

Move qcom,gcc-apq8084 to clock/qcom,gcc-other.yaml as it follows a generic
bindings rather than qcom,gcc-apq8064 one. Also while we are at it, move
qcom,gcc-msm8960 in the other direction: from qcom,gcc-other.yaml to
qcom,gcc-apq8064.yaml as MSM8960 shares the design and the driver with
APQ8064 platform.

Changes since v1:
 - Split the msm8960 change into a separate patch
 - Remove qcom,gcc-msm8960 compat from qcom,gcc-other.yaml

Dmitry Baryshkov (2):
  dt-bindings: clock: gcc-apq8064: move qcom,apq8084 back to
    gcc-other.yaml
  dt-bindings: clock/qcom,gcc-apq8064: move msm8960 compat from
    gcc-other.yaml

 .../devicetree/bindings/clock/qcom,gcc-apq8064.yaml       | 8 ++++----
 .../devicetree/bindings/clock/qcom,gcc-other.yaml         | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

-- 
2.35.1

[PATCH v2 1/2] dt-bindings: clock: gcc-apq8064: move qcom,apq8084 back to gcc-other.yaml

[Dmitry Baryshkov]

The global clock controller on apq8084 has nothing to do with the schema
for apq8064. It uses the schema defined in qcom,gcc-other.yaml. Move
respective declarations back.

Instead add what was really meant to be present in qcom,gcc-apq8064
schema: the compatibility string for qcom,apq8064 device.

Fixes: a469bf89a009 ("dt-bindings: clock: simplify qcom,gcc-apq8064 Documentation")
Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml | 4 +---
 Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml   | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml
index 97936411b6b4..9fafcb080069 100644
--- a/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml
@@ -20,12 +20,10 @@ description: |
   See also:
   - dt-bindings/clock/qcom,gcc-msm8960.h
   - dt-bindings/reset/qcom,gcc-msm8960.h
-  - dt-bindings/clock/qcom,gcc-apq8084.h
-  - dt-bindings/reset/qcom,gcc-apq8084.h
 
 properties:
   compatible:
-    const: qcom,gcc-apq8084
+    const: qcom,gcc-apq8064
 
   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 6c45e0f85494..142402f29d98 100644
--- a/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml
@@ -15,6 +15,8 @@ description: |
   power domains.
 
   See also:
+  - dt-bindings/clock/qcom,gcc-apq8084.h
+  - dt-bindings/reset/qcom,gcc-apq8084.h
   - dt-bindings/clock/qcom,gcc-ipq4019.h
   - dt-bindings/clock/qcom,gcc-ipq6018.h
   - dt-bindings/reset/qcom,gcc-ipq6018.h
@@ -36,6 +38,7 @@ allOf:
 properties:
   compatible:
     enum:
+      - qcom,gcc-apq8084
       - qcom,gcc-ipq4019
       - qcom,gcc-ipq6018
       - qcom,gcc-mdm9607
-- 
2.35.1

[PATCH v2 2/2] dt-bindings: clock/qcom,gcc-apq8064: move msm8960 compat from gcc-other.yaml

[Dmitry Baryshkov]

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@linaro.org>
---
 .../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

Re: [PATCH v2 1/2] dt-bindings: clock: gcc-apq8064: move qcom,apq8084 back to gcc-other.yaml

[Rob Herring]

On Tue, Apr 26, 2022 at 12:36:07PM +0300, Dmitry Baryshkov wrote:
> The global clock controller on apq8084 has nothing to do with the schema
> for apq8064. It uses the schema defined in qcom,gcc-other.yaml. Move
> respective declarations back.
> 
> Instead add what was really meant to be present in qcom,gcc-apq8064
> schema: the compatibility string for qcom,apq8064 device.
> 
> Fixes: a469bf89a009 ("dt-bindings: clock: simplify qcom,gcc-apq8064 Documentation")
> Reported-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml | 4 +---
>  Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml   | 3 +++
>  2 files changed, 4 insertions(+), 3 deletions(-)

Thanks for sorting this out!

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH v2 2/2] dt-bindings: clock/qcom,gcc-apq8064: move msm8960 compat from gcc-other.yaml

[Rob Herring]

On Tue, 26 Apr 2022 12:36:08 +0300, Dmitry Baryshkov wrote:
> 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@linaro.org>
> ---
>  .../devicetree/bindings/clock/qcom,gcc-apq8064.yaml         | 6 ++++--
>  Documentation/devicetree/bindings/clock/qcom,gcc-other.yaml | 5 ++---
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>