[PATCH 0/5] sdm845 and msm8996 clock updates

[PATCH 0/5] sdm845 and msm8996 clock updates

[Dmitry Baryshkov]

This is a dts (and bindings) counterpart for the
https://patchwork.kernel.org/project/linux-arm-msm/list/?series=601612

sdm845.dtsi (camcc) and msm8996.dtsi (gcc) are updated to
use DT clock bindings rather than global clock output names.

Dmitry Baryshkov (5):
  dt-bindings: clocks: convert SDM845 Camera CC bindings to YAML
  dt-bindings: clocks: qcom,sdm845-camcc: add clocks/clock-names
  arm64: dts: qcom: sdm845: add bi_tcxo to camcc
  arm64: dts: qcom: msm8996: add cxo and sleep-clk to gcc node
  arm64: dts: qcom: msm8996: convert xo_board to RPM_SMD_BB_CLK1

 .../devicetree/bindings/clock/qcom,camcc.txt  | 18 -----
 .../bindings/clock/qcom,sdm845-camcc.yaml     | 65 +++++++++++++++++++
 arch/arm64/boot/dts/qcom/msm8996.dtsi         | 16 +++--
 arch/arm64/boot/dts/qcom/sdm845.dtsi          |  2 +
 4 files changed, 76 insertions(+), 25 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/qcom,camcc.txt
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml


base-commit: e783362eb54cd99b2cac8b3a9aeac942e6f6ac07
prerequisite-patch-id: faf41e7cd54deef9eb7db61dc3b1022c131e3b6a
prerequisite-patch-id: 6d2b8a35d8d003a3f0e1ac6c3dd40c3f60824575
prerequisite-patch-id: d3d408d274687adfa38281219a9cbf0165e10771
prerequisite-patch-id: 6bae15b7a39499c9202269cb6ab617ad855c1c8e
prerequisite-patch-id: 0798178208d922a9541cb8c6267010e5374ca7f1
prerequisite-patch-id: 4e9967e6ab4154f3dda3bd7528fb78f5e4b1fe3a
prerequisite-patch-id: 8a7d887e248c1c925f6f649a42a7e0a31c74d9ca
prerequisite-patch-id: b7d94b74783a451f5eae89bcf745e8268ee78250
prerequisite-patch-id: ab4650463050af807fdf5529e63c1ca8b4cd15f3
prerequisite-patch-id: 80b4fd161bba1eda9f0a6624ef694900e1bc1b20
prerequisite-patch-id: 8289d90134fd68beb3d7267e8b696d9f9367a41f
prerequisite-patch-id: fe3663dbfc680b17b3d888b928011ff75b7a876f
prerequisite-patch-id: f3221f3e2ff5348902d4a2a986d4592cb5220060
prerequisite-patch-id: 7cddd86bcdfd62280e2eda773ef261d231053f46
prerequisite-patch-id: 258763de211d1d1a721c4f56452598cb8ca97bf7
prerequisite-patch-id: 640ed205f402595dd9faa0e3fbaeb12402a700bb
-- 
2.34.1

[PATCH 1/5] dt-bindings: clocks: convert SDM845 Camera CC bindings to YAML

[Dmitry Baryshkov]

Convert clock/qcom,camcc.txt to clock/qcom,sdm845-camcc.yaml.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../devicetree/bindings/clock/qcom,camcc.txt  | 18 ------
 .../bindings/clock/qcom,sdm845-camcc.yaml     | 63 +++++++++++++++++++
 2 files changed, 63 insertions(+), 18 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/clock/qcom,camcc.txt
 create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml

diff --git a/Documentation/devicetree/bindings/clock/qcom,camcc.txt b/Documentation/devicetree/bindings/clock/qcom,camcc.txt
deleted file mode 100644
index c5eb6694fda9..000000000000
--- a/Documentation/devicetree/bindings/clock/qcom,camcc.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-Qualcomm Camera Clock & Reset Controller Binding
-------------------------------------------------
-
-Required properties :
-- compatible : shall contain "qcom,sdm845-camcc".
-- reg : shall contain base register location and length.
-- #clock-cells : from common clock binding, shall contain 1.
-- #reset-cells : from common reset binding, shall contain 1.
-- #power-domain-cells : from generic power domain binding, shall contain 1.
-
-Example:
-	camcc: clock-controller@ad00000 {
-		compatible = "qcom,sdm845-camcc";
-		reg = <0xad00000 0x10000>;
-		#clock-cells = <1>;
-		#reset-cells = <1>;
-		#power-domain-cells = <1>;
-	};
diff --git a/Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml b/Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml
new file mode 100644
index 000000000000..c61314caf692
--- /dev/null
+++ b/Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml
@@ -0,0 +1,63 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/clock/qcom,sdm845-camcc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Camera Clock & Reset Controller Binding for SDM845
+
+maintainers:
+  - Bjorn Andersson <bjorn.andersson@linaro.org>
+
+description: |
+  Qualcomm camera clock control module which supports the clocks, resets and
+  power domains on SDM845.
+
+  See also dt-bindings/clock/qcom,camcc-sm845.h
+
+properties:
+  compatible:
+    const: qcom,sdm845-camcc
+
+  clocks:
+    items:
+      - description: Board XO source
+
+  clock-names:
+    items:
+      - const: bi_tcxo
+
+  '#clock-cells':
+    const: 1
+
+  '#reset-cells':
+    const: 1
+
+  '#power-domain-cells':
+    const: 1
+
+  reg:
+    maxItems: 1
+
+required:
+  - compatible
+  - reg
+  - clocks
+  - clock-names
+  - '#clock-cells'
+  - '#reset-cells'
+  - '#power-domain-cells'
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/qcom,rpmh.h>
+    clock-controller@ad00000 {
+      compatible = "qcom,sdm845-camcc";
+      reg = <0x0ad00000 0x10000>;
+      #clock-cells = <1>;
+      #reset-cells = <1>;
+      #power-domain-cells = <1>;
+    };
+...
-- 
2.34.1

[PATCH 2/5] dt-bindings: clocks: qcom,sdm845-camcc: add clocks/clock-names

[Dmitry Baryshkov]

The driver can parse bi-tcxo clock from the clocks passed in the device
tree. Specify it in schema.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml b/Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml
index c61314caf692..d4239ccae917 100644
--- a/Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,sdm845-camcc.yaml
@@ -56,6 +56,8 @@ examples:
     clock-controller@ad00000 {
       compatible = "qcom,sdm845-camcc";
       reg = <0x0ad00000 0x10000>;
+      clocks = <&rpmhcc RPMH_CXO_CLK>;
+      clock-names = "bi_tcxo";
       #clock-cells = <1>;
       #reset-cells = <1>;
       #power-domain-cells = <1>;
-- 
2.34.1

[PATCH 3/5] arm64: dts: qcom: sdm845: add bi_tcxo to camcc

[Dmitry Baryshkov]

Declare TCXO clock used for the Camera Clock Controller on SDM845.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index cfdeaa81f1bb..9288bcd3475b 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -4139,6 +4139,8 @@ clock_camcc: clock-controller@ad00000 {
 			#clock-cells = <1>;
 			#reset-cells = <1>;
 			#power-domain-cells = <1>;
+			clocks = <&rpmhcc RPMH_CXO_CLK>;
+			clock-names = "bi_tcxo";
 		};
 
 		dsi_opp_table: dsi-opp-table {
-- 
2.34.1

[PATCH 4/5] arm64: dts: qcom: msm8996: add cxo and sleep-clk to gcc node

[Dmitry Baryshkov]

Supply proper cxo (RPM_SMD_BB_CLK1) and sleep_clk to the gcc clock
controller node.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 91bc974aeb0a..7a46f0f67cbb 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -679,8 +679,10 @@ gcc: clock-controller@300000 {
 			#power-domain-cells = <1>;
 			reg = <0x00300000 0x90000>;
 
-			clocks = <&rpmcc RPM_SMD_LN_BB_CLK>;
-			clock-names = "cxo2";
+			clocks = <&rpmcc RPM_SMD_BB_CLK1>,
+				 <&rpmcc RPM_SMD_LN_BB_CLK>,
+				 <&sleep_clk>;
+			clock-names = "cxo", "cxo2", "sleep_clk";
 		};
 
 		tsens0: thermal-sensor@4a9000 {
-- 
2.34.1

[PATCH 5/5] arm64: dts: qcom: msm8996: convert xo_board to RPM_SMD_BB_CLK1

[Dmitry Baryshkov]

Convert all device tree xo_board users to the RPM_SMD_BB_CLK1 clock.
Note, that xo_board can not be removed (yet), as clk-smd-rpm uses
xo_board internally as the parent for all the clocks.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 arch/arm64/boot/dts/qcom/msm8996.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 7a46f0f67cbb..598dbaab1d1c 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -889,7 +889,7 @@ dsi0_phy: dsi-phy@994400 {
 				#clock-cells = <1>;
 				#phy-cells = <0>;
 
-				clocks = <&mmcc MDSS_AHB_CLK>, <&xo_board>;
+				clocks = <&mmcc MDSS_AHB_CLK>, <&rpmcc RPM_SMD_BB_CLK1>;
 				clock-names = "iface", "ref";
 				status = "disabled";
 			};
@@ -2595,7 +2595,7 @@ kryocc: clock-controller@6400000 {
 			reg = <0x06400000 0x90000>;
 
 			clock-names = "xo";
-			clocks = <&xo_board>;
+			clocks = <&rpmcc RPM_SMD_BB_CLK1>;
 
 			#clock-cells = <1>;
 		};
@@ -2706,7 +2706,7 @@ sdhc1: sdhci@7464900 {
 			clock-names = "iface", "core", "xo";
 			clocks = <&gcc GCC_SDCC1_AHB_CLK>,
 				<&gcc GCC_SDCC1_APPS_CLK>,
-				<&xo_board>;
+				<&rpmcc RPM_SMD_BB_CLK1>;
 
 			pinctrl-names = "default", "sleep";
 			pinctrl-0 = <&sdc1_state_on>;
@@ -2729,7 +2729,7 @@ sdhc2: sdhci@74a4900 {
 			clock-names = "iface", "core", "xo";
 			clocks = <&gcc GCC_SDCC2_AHB_CLK>,
 				<&gcc GCC_SDCC2_APPS_CLK>,
-				<&xo_board>;
+				<&rpmcc RPM_SMD_BB_CLK1>;
 
 			pinctrl-names = "default", "sleep";
 			pinctrl-0 = <&sdc2_state_on>;
@@ -3030,7 +3030,7 @@ adsp_pil: remoteproc@9300000 {
 			interrupt-names = "wdog", "fatal", "ready",
 					  "handover", "stop-ack";
 
-			clocks = <&xo_board>;
+			clocks = <&rpmcc RPM_SMD_BB_CLK1>;
 			clock-names = "xo";
 
 			memory-region = <&adsp_region>;
-- 
2.34.1

Re: [PATCH 1/5] dt-bindings: clocks: convert SDM845 Camera CC bindings to YAML

[Stephen Boyd]

Quoting Dmitry Baryshkov (2022-02-15 12:15:35)
> Convert clock/qcom,camcc.txt to clock/qcom,sdm845-camcc.yaml.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Stephen Boyd <sboyd@kernel.org>

Re: [PATCH 2/5] dt-bindings: clocks: qcom,sdm845-camcc: add clocks/clock-names

[Stephen Boyd]

Quoting Dmitry Baryshkov (2022-02-15 12:15:36)
> The driver can parse bi-tcxo clock from the clocks passed in the device
> tree. Specify it in schema.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---

Reviewed-by: Stephen Boyd <sboyd@kernel.org>

Re: [PATCH 4/5] arm64: dts: qcom: msm8996: add cxo and sleep-clk to gcc node

[Bjorn Andersson]

On Tue 15 Feb 14:15 CST 2022, Dmitry Baryshkov wrote:

> Supply proper cxo (RPM_SMD_BB_CLK1) and sleep_clk to the gcc clock
> controller node.
> 

Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index 91bc974aeb0a..7a46f0f67cbb 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -679,8 +679,10 @@ gcc: clock-controller@300000 {
>  			#power-domain-cells = <1>;
>  			reg = <0x00300000 0x90000>;
>  
> -			clocks = <&rpmcc RPM_SMD_LN_BB_CLK>;
> -			clock-names = "cxo2";
> +			clocks = <&rpmcc RPM_SMD_BB_CLK1>,
> +				 <&rpmcc RPM_SMD_LN_BB_CLK>,
> +				 <&sleep_clk>;
> +			clock-names = "cxo", "cxo2", "sleep_clk";
>  		};
>  
>  		tsens0: thermal-sensor@4a9000 {
> -- 
> 2.34.1
> 

Re: (subset) [PATCH 0/5] sdm845 and msm8996 clock updates

[Bjorn Andersson]

On Tue, 15 Feb 2022 23:15:34 +0300, Dmitry Baryshkov wrote:
> This is a dts (and bindings) counterpart for the
> https://patchwork.kernel.org/project/linux-arm-msm/list/?series=601612
> 
> sdm845.dtsi (camcc) and msm8996.dtsi (gcc) are updated to
> use DT clock bindings rather than global clock output names.
> 
> Dmitry Baryshkov (5):
>   dt-bindings: clocks: convert SDM845 Camera CC bindings to YAML
>   dt-bindings: clocks: qcom,sdm845-camcc: add clocks/clock-names
>   arm64: dts: qcom: sdm845: add bi_tcxo to camcc
>   arm64: dts: qcom: msm8996: add cxo and sleep-clk to gcc node
>   arm64: dts: qcom: msm8996: convert xo_board to RPM_SMD_BB_CLK1
> 
> [...]

Applied, thanks!

[1/5] dt-bindings: clocks: convert SDM845 Camera CC bindings to YAML
      commit: a0d61d02c102d93e8c8f653cbfdc3bf485d45aaf
[2/5] dt-bindings: clocks: qcom,sdm845-camcc: add clocks/clock-names
      commit: 2564aa7544f493c64b397e02a2b477591016aa24

Best regards,
-- 
Bjorn Andersson <bjorn.andersson@linaro.org>