[PATCH] dt-bindings: clock: qcom,sm6375-gcc: Merge SM7150 into SM6375

[PATCH] dt-bindings: clock: qcom,sm6375-gcc: Merge SM7150 into SM6375

[Krzysztof Kozlowski]

Bindings for Qualcomm SM7150 and SM6375 GCC clock controllers are
identical, so this could be one file for less handling and encouraging
future grouping of similar devices (like SM7250 which also would fit here).

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
 .../bindings/clock/qcom,sm6375-gcc.yaml       |  9 +++-
 .../bindings/clock/qcom,sm7150-gcc.yaml       | 53 -------------------
 2 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml

diff --git a/Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml b/Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml
index 66dfa72fa975..b4ad2ad14d85 100644
--- a/Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml
@@ -4,10 +4,13 @@
 $id: http://devicetree.org/schemas/clock/qcom,sm6375-gcc.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Qualcomm Global Clock & Reset Controller on SM6375
+title: Qualcomm Global Clock & Reset Controller on SM6375 and SM7150
 
 maintainers:
   - Konrad Dybcio <konradybcio@kernel.org>
+  - Bjorn Andersson <andersson@kernel.org>
+  - Danila Tikhonov <danila@jiaxyga.com>
+  - David Wronek <davidwronek@gmail.com>
 
 description: |
   Qualcomm global clock control module provides the clocks, resets and power
@@ -20,7 +23,9 @@ allOf:
 
 properties:
   compatible:
-    const: qcom,sm6375-gcc
+    enum:
+      - qcom,sm6375-gcc
+      - qcom,sm7150-gcc
 
   clocks:
     items:
diff --git a/Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml b/Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml
deleted file mode 100644
index 3878808f811e..000000000000
--- a/Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/clock/qcom,sm7150-gcc.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: Qualcomm Global Clock & Reset Controller on SM7150
-
-maintainers:
-  - Bjorn Andersson <andersson@kernel.org>
-  - Danila Tikhonov <danila@jiaxyga.com>
-  - David Wronek <davidwronek@gmail.com>
-
-description: |
-  Qualcomm global clock control module provides the clocks, resets and power
-  domains on SM7150
-
-  See also: include/dt-bindings/clock/qcom,sm7150-gcc.h
-
-properties:
-  compatible:
-    const: qcom,sm7150-gcc
-
-  clocks:
-    items:
-      - description: Board XO source
-      - description: Board XO Active-Only source
-      - description: Sleep clock source
-
-required:
-  - compatible
-  - clocks
-  - '#power-domain-cells'
-
-allOf:
-  - $ref: qcom,gcc.yaml#
-
-unevaluatedProperties: false
-
-examples:
-  - |
-    #include <dt-bindings/clock/qcom,rpmh.h>
-    clock-controller@100000 {
-      compatible = "qcom,sm7150-gcc";
-      reg = <0x00100000 0x001f0000>;
-      clocks = <&rpmhcc RPMH_CXO_CLK>,
-               <&rpmhcc RPMH_CXO_CLK_A>,
-               <&sleep_clk>;
-      #clock-cells = <1>;
-      #reset-cells = <1>;
-      #power-domain-cells = <1>;
-    };
-...
-- 
2.53.0

Re: [PATCH] dt-bindings: clock: qcom,sm6375-gcc: Merge SM7150 into SM6375

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] Incomplete update of the binding description when merging SM7150 support.
--

--- Patch [1]: [PATCH] dt-bindings: clock: qcom,sm6375-gcc: Merge SM7150 into SM6375 ---
commit 92315f069f3a56f62591f2cf108c846e8914866e
Author: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

dt-bindings: clock: qcom,sm6375-gcc: Merge SM7150 into SM6375

Bindings for Qualcomm SM7150 and SM6375 GCC clock controllers are merged
into a single file since they share identical structures. The SM7150 binding
is deleted and added as a compatible string to the SM6375 file.

> diff --git a/Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml b/Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml
> index 66dfa72fa9751..b4ad2ad14d85e 100644
> --- a/Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml
> +++ b/Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml
> @@ -4,10 +4,13 @@
>  $id: http://devicetree.org/schemas/clock/qcom,sm6375-gcc.yaml#
>  $schema: http://devicetree.org/meta-schemas/core.yaml#
>  
> -title: Qualcomm Global Clock & Reset Controller on SM6375
> +title: Qualcomm Global Clock & Reset Controller on SM6375 and SM7150
>  
>  maintainers:
>    - Konrad Dybcio <konradybcio@kernel.org>
> +  - Bjorn Andersson <andersson@kernel.org>
> +  - Danila Tikhonov <danila@jiaxyga.com>
> +  - David Wronek <davidwronek@gmail.com>
>  
>  description: |
>    Qualcomm global clock control module provides the clocks, resets and power

[Severity: Medium]
Should the description block be updated to include a reference to the SM7150
header file?

The deleted qcom,sm7150-gcc.yaml file contained:

  See also: include/dt-bindings/clock/qcom,sm7150-gcc.h

Leaving only the SM6375 header reference might mislead developers configuring
SM7150 hardware into using incorrect clock indices, as the clock IDs typically
differ between the two chips.

[ ... ]

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260817082457.64797-2-krzysztof.kozlowski@oss.qualcomm.com?part=1