[PATCH 0/4] arm64: dts: qcom: msm8996: add missing clock sources

[PATCH 0/4] arm64: dts: qcom: msm8996: add missing clock sources

[Dmitry Baryshkov]

Add missing clock sources to the RPM and global clock controllers.

Dmitry Baryshkov (4):
  dt-bindings: clock: qcom,gcc-msm8996: add more GCC clock sources
  arm64: dts: qcom: msm8996: correct #clock-cells for QMP PHY nodes
  arm64: dts: qcom: msm8996: add GCC's optional clock sources
  arm64: dts: qcom: msm8996: add xo clock source to rpmcc

 .../bindings/clock/qcom,gcc-msm8996.yaml      | 16 ++++++++++++
 arch/arm64/boot/dts/qcom/msm8996.dtsi         | 26 ++++++++++++++++---
 2 files changed, 38 insertions(+), 4 deletions(-)

-- 
2.35.1

[PATCH 1/4] dt-bindings: clock: qcom,gcc-msm8996: add more GCC clock sources

[Dmitry Baryshkov]

Add additional GCC clock sources. This includes PCIe and USB PIPE and
UFS symbol clocks.

Fixes: 2a8aa18c1131 ("dt-bindings: clk: qcom: Fix self-validation, split, and clean cruft")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 .../bindings/clock/qcom,gcc-msm8996.yaml         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc-msm8996.yaml b/Documentation/devicetree/bindings/clock/qcom,gcc-msm8996.yaml
index 70f7d3101bd3..dfc5165db9f1 100644
--- a/Documentation/devicetree/bindings/clock/qcom,gcc-msm8996.yaml
+++ b/Documentation/devicetree/bindings/clock/qcom,gcc-msm8996.yaml
@@ -22,16 +22,32 @@ properties:
     const: qcom,gcc-msm8996
 
   clocks:
+    minItems: 3
     items:
       - description: XO source
       - description: Second XO source
       - description: Sleep clock source
+      - description: PCIe 0 PIPE clock (optional)
+      - description: PCIe 1 PIPE clock (optional)
+      - description: PCIe 2 PIPE clock (optional)
+      - description: USB3 PIPE clock (optional)
+      - description: UFS RX symbol 0 clock (optional)
+      - description: UFS RX symbol 1 clock (optional)
+      - description: UFS TX symbol 0 clock (optional)
 
   clock-names:
+    minItems: 3
     items:
       - const: cxo
       - const: cxo2
       - const: sleep_clk
+      - const: pcie_0_pipe_clk_src
+      - const: pcie_1_pipe_clk_src
+      - const: pcie_2_pipe_clk_src
+      - const: usb3_phy_pipe_clk_src
+      - const: ufs_rx_symbol_0_clk_src
+      - const: ufs_rx_symbol_1_clk_src
+      - const: ufs_tx_symbol_0_clk_src
 
 required:
   - compatible
-- 
2.35.1

[PATCH 2/4] arm64: dts: qcom: msm8996: correct #clock-cells for QMP PHY nodes

[Dmitry Baryshkov]

The commit 82d61e19fccb ("arm64: dts: qcom: msm8996: Move '#clock-cells'
to QMP PHY child node") moved the '#clock-cells' properties to the child
nodes. However it missed the fact that the property must have been set
to <0> (as all pipe clocks use of_clk_hw_simple_get as the xlate
function. Also the mentioned commit didn't add '#clock-cells' properties
to second and third PCIe PHY nodes. Correct both these mistakes:

- Set '#clock-cells' to <0>,
- Add the property to pciephy_1 and pciephy_2 nodes.

Fixes: 82d61e19fccb ("arm64: dts: qcom: msm8996: Move '#clock-cells' to QMP PHY child 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 1341cb7ba168..e97f193aefd3 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -609,7 +609,7 @@ pciephy_0: phy@35000 {
 				      <0x00035400 0x1dc>;
 				#phy-cells = <0>;
 
-				#clock-cells = <1>;
+				#clock-cells = <0>;
 				clock-output-names = "pcie_0_pipe_clk_src";
 				clocks = <&gcc GCC_PCIE_0_PIPE_CLK>;
 				clock-names = "pipe0";
@@ -623,6 +623,7 @@ pciephy_1: phy@36000 {
 				      <0x00036400 0x1dc>;
 				#phy-cells = <0>;
 
+				#clock-cells = <0>;
 				clock-output-names = "pcie_1_pipe_clk_src";
 				clocks = <&gcc GCC_PCIE_1_PIPE_CLK>;
 				clock-names = "pipe1";
@@ -636,6 +637,7 @@ pciephy_2: phy@37000 {
 				      <0x00037400 0x1dc>;
 				#phy-cells = <0>;
 
+				#clock-cells = <0>;
 				clock-output-names = "pcie_2_pipe_clk_src";
 				clocks = <&gcc GCC_PCIE_2_PIPE_CLK>;
 				clock-names = "pipe2";
@@ -2862,7 +2864,7 @@ ssusb_phy_0: phy@7410200 {
 				      <0x07410600 0x1a8>;
 				#phy-cells = <0>;
 
-				#clock-cells = <1>;
+				#clock-cells = <0>;
 				clock-output-names = "usb3_phy_pipe_clk_src";
 				clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>;
 				clock-names = "pipe0";
-- 
2.35.1

[PATCH 3/4] arm64: dts: qcom: msm8996: add GCC's optional clock sources

[Dmitry Baryshkov]

Add missing GCC clock sources. This includes PCIe and USB PIPE and UFS
symbol clocks.

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

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index e97f193aefd3..6c7380f86383 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -689,8 +689,22 @@ gcc: clock-controller@300000 {
 
 			clocks = <&rpmcc RPM_SMD_BB_CLK1>,
 				 <&rpmcc RPM_SMD_LN_BB_CLK>,
-				 <&sleep_clk>;
-			clock-names = "cxo", "cxo2", "sleep_clk";
+				 <&sleep_clk>,
+				 <&pciephy_0>,
+				 <&pciephy_1>,
+				 <&pciephy_2>,
+				 <&ssusb_phy_0>,
+				 <0>, <0>, <0>;
+			clock-names = "cxo",
+				      "cxo2",
+				      "sleep_clk",
+				      "pcie_0_pipe_clk_src",
+				      "pcie_1_pipe_clk_src",
+				      "pcie_2_pipe_clk_src",
+				      "usb3_phy_pipe_clk_src",
+				      "ufs_rx_symbol_0_clk_src",
+				      "ufs_rx_symbol_1_clk_src",
+				      "ufs_tx_symbol_0_clk_src";
 		};
 
 		tsens0: thermal-sensor@4a9000 {
-- 
2.35.1

[PATCH 4/4] arm64: dts: qcom: msm8996: add xo clock source to rpmcc

[Dmitry Baryshkov]

Add XO clock source to the RPM clock controller.

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

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 6c7380f86383..f7a69ed05968 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -463,6 +463,8 @@ rpm_requests: rpm-requests {
 			rpmcc: qcom,rpmcc {
 				compatible = "qcom,rpmcc-msm8996", "qcom,rpmcc";
 				#clock-cells = <1>;
+				clocks = <&xo_board>;
+				clock-names = "xo";
 			};
 
 			rpmpd: power-controller {
-- 
2.35.1

Re: [PATCH 1/4] dt-bindings: clock: qcom,gcc-msm8996: add more GCC clock sources

[Krzysztof Kozlowski]

On 20/06/2022 09:19, Dmitry Baryshkov wrote:
> Add additional GCC clock sources. This includes PCIe and USB PIPE and
> UFS symbol clocks.
> 
> Fixes: 2a8aa18c1131 ("dt-bindings: clk: qcom: Fix self-validation, split, and clean cruft")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  .../bindings/clock/qcom,gcc-msm8996.yaml         | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
> 
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH 3/4] arm64: dts: qcom: msm8996: add GCC's optional clock sources

[Krzysztof Kozlowski]

On 20/06/2022 09:19, Dmitry Baryshkov wrote:
> Add missing GCC clock sources. This includes PCIe and USB PIPE and UFS
> symbol clocks.
> 
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  arch/arm64/boot/dts/qcom/msm8996.dtsi | 18 ++++++++++++++++--
>  1 file changed, 16 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index e97f193aefd3..6c7380f86383 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -689,8 +689,22 @@ gcc: clock-controller@300000 {
>  
>  			clocks = <&rpmcc RPM_SMD_BB_CLK1>,
>  				 <&rpmcc RPM_SMD_LN_BB_CLK>,
> -				 <&sleep_clk>;
> -			clock-names = "cxo", "cxo2", "sleep_clk";
> +				 <&sleep_clk>,
> +				 <&pciephy_0>,
> +				 <&pciephy_1>,
> +				 <&pciephy_2>,
> +				 <&ssusb_phy_0>,
> +				 <0>, <0>, <0>;

Since the clocks are optional, there is no need to pass <0> to them. I
think it does not bring any benefits.

> +			clock-names = "cxo",
> +				      "cxo2",
> +				      "sleep_clk",
> +				      "pcie_0_pipe_clk_src",
> +				      "pcie_1_pipe_clk_src",
> +				      "pcie_2_pipe_clk_src",
> +				      "usb3_phy_pipe_clk_src",
> +				      "ufs_rx_symbol_0_clk_src",
> +				      "ufs_rx_symbol_1_clk_src",
> +				      "ufs_tx_symbol_0_clk_src";
>  		};
>  
>  		tsens0: thermal-sensor@4a9000 {


Best regards,
Krzysztof

Re: [PATCH 3/4] arm64: dts: qcom: msm8996: add GCC's optional clock sources

[Dmitry Baryshkov]

On Mon, 20 Jun 2022 at 14:24, Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> On 20/06/2022 09:19, Dmitry Baryshkov wrote:
> > Add missing GCC clock sources. This includes PCIe and USB PIPE and UFS
> > symbol clocks.
> >
> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> > ---
> >  arch/arm64/boot/dts/qcom/msm8996.dtsi | 18 ++++++++++++++++--
> >  1 file changed, 16 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> > index e97f193aefd3..6c7380f86383 100644
> > --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> > @@ -689,8 +689,22 @@ gcc: clock-controller@300000 {
> >
> >                       clocks = <&rpmcc RPM_SMD_BB_CLK1>,
> >                                <&rpmcc RPM_SMD_LN_BB_CLK>,
> > -                              <&sleep_clk>;
> > -                     clock-names = "cxo", "cxo2", "sleep_clk";
> > +                              <&sleep_clk>,
> > +                              <&pciephy_0>,
> > +                              <&pciephy_1>,
> > +                              <&pciephy_2>,
> > +                              <&ssusb_phy_0>,
> > +                              <0>, <0>, <0>;
>
> Since the clocks are optional, there is no need to pass <0> to them. I
> think it does not bring any benefits.

It serves as a reminder that they should be filled with the proper
sources. We do the same thing for DSI/DP clocks where the PHY is not
yet supported, but the GCC lists them.

I had to mark them as optional so that the existing schema files pass
validation. Otherwise they would be in the 'required' part.

>
> > +                     clock-names = "cxo",
> > +                                   "cxo2",
> > +                                   "sleep_clk",
> > +                                   "pcie_0_pipe_clk_src",
> > +                                   "pcie_1_pipe_clk_src",
> > +                                   "pcie_2_pipe_clk_src",
> > +                                   "usb3_phy_pipe_clk_src",
> > +                                   "ufs_rx_symbol_0_clk_src",
> > +                                   "ufs_rx_symbol_1_clk_src",
> > +                                   "ufs_tx_symbol_0_clk_src";
> >               };
> >
> >               tsens0: thermal-sensor@4a9000 {
>
>
> Best regards,
> Krzysztof



-- 
With best wishes
Dmitry

Re: [PATCH 3/4] arm64: dts: qcom: msm8996: add GCC's optional clock sources

[Krzysztof Kozlowski]

On 20/06/2022 13:27, Dmitry Baryshkov wrote:
> On Mon, 20 Jun 2022 at 14:24, Krzysztof Kozlowski
> <krzysztof.kozlowski@linaro.org> wrote:
>>
>> On 20/06/2022 09:19, Dmitry Baryshkov wrote:
>>> Add missing GCC clock sources. This includes PCIe and USB PIPE and UFS
>>> symbol clocks.
>>>
>>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>>> ---
>>>  arch/arm64/boot/dts/qcom/msm8996.dtsi | 18 ++++++++++++++++--
>>>  1 file changed, 16 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
>>> index e97f193aefd3..6c7380f86383 100644
>>> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
>>> @@ -689,8 +689,22 @@ gcc: clock-controller@300000 {
>>>
>>>                       clocks = <&rpmcc RPM_SMD_BB_CLK1>,
>>>                                <&rpmcc RPM_SMD_LN_BB_CLK>,
>>> -                              <&sleep_clk>;
>>> -                     clock-names = "cxo", "cxo2", "sleep_clk";
>>> +                              <&sleep_clk>,
>>> +                              <&pciephy_0>,
>>> +                              <&pciephy_1>,
>>> +                              <&pciephy_2>,
>>> +                              <&ssusb_phy_0>,
>>> +                              <0>, <0>, <0>;
>>
>> Since the clocks are optional, there is no need to pass <0> to them. I
>> think it does not bring any benefits.
> 
> It serves as a reminder that they should be filled with the proper
> sources. We do the same thing for DSI/DP clocks where the PHY is not
> yet supported, but the GCC lists them.
> 
> I had to mark them as optional so that the existing schema files pass
> validation. Otherwise they would be in the 'required' part.
> 

Hm, ok. Let's hope someone will actually remember to fill these in once
there is proper clock.


Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>


Best regards,
Krzysztof

Re: (subset) [PATCH 0/4] arm64: dts: qcom: msm8996: add missing clock sources

[Bjorn Andersson]

On Mon, 20 Jun 2022 10:19:32 +0300, Dmitry Baryshkov wrote:
> Add missing clock sources to the RPM and global clock controllers.
> 
> Dmitry Baryshkov (4):
>   dt-bindings: clock: qcom,gcc-msm8996: add more GCC clock sources
>   arm64: dts: qcom: msm8996: correct #clock-cells for QMP PHY nodes
>   arm64: dts: qcom: msm8996: add GCC's optional clock sources
>   arm64: dts: qcom: msm8996: add xo clock source to rpmcc
> 
> [...]

Applied, thanks!

[2/4] arm64: dts: qcom: msm8996: correct #clock-cells for QMP PHY nodes
      commit: b874fff9a7683df30e5aff16d5a85b1f8a43aa5d
[3/4] arm64: dts: qcom: msm8996: add GCC's optional clock sources
      commit: edb8e38ca99f198b59c967c9e26719198cea8bf8
[4/4] arm64: dts: qcom: msm8996: add xo clock source to rpmcc
      commit: 2b111e30c3b114d20ddaf3b79d07723fdedbe1a3

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

Re: (subset) [PATCH 1/4] dt-bindings: clock: qcom,gcc-msm8996: add more GCC clock sources

[Bjorn Andersson]

On Mon, 20 Jun 2022 10:19:33 +0300, Dmitry Baryshkov wrote:
> Add additional GCC clock sources. This includes PCIe and USB PIPE and
> UFS symbol clocks.
> 
> 

Applied, thanks!

[1/4] dt-bindings: clock: qcom,gcc-msm8996: add more GCC clock sources
      commit: 2b4e75a7a7c8d3531a40ebb103b92f88ff693f79

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