[PATCH 1/2] dt-bindings: clock: qcom: Fix the xo parent in gpucc example

[PATCH 1/2] dt-bindings: clock: qcom: Fix the xo parent in gpucc example

[Douglas Anderson]

In the bindings that landed for the gpucc we require that the XO clock
(one possible parent of the gpucc) be listed.  The code doesn't use
this yet--this is just to allow us to move toward the day when it does
use it.  What the code does do today is to hardcode the parent name to
"bi_tcxo".  That's all well and good.

...but the example in the bindings shows this clock mapping to the
clock "xo_board".  On the current sdm845.dtsi file the "xo_board"
clock is a fixed clock with an output name of "xo_board".  The clock
with the name "bi_tcxo" is actually provided by the RPMh Clock
Controller.  Presumably that's the one that was wanted.

Let's update the example to make this clearer.

Fixes: e431c92188a9 ("dt-bindings: clock: Introduce QCOM Graphics clock bindings")
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---

 Documentation/devicetree/bindings/clock/qcom,gpucc.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/clock/qcom,gpucc.txt b/Documentation/devicetree/bindings/clock/qcom,gpucc.txt
index 9d0358cc08b4..4e5215ef1acd 100644
--- a/Documentation/devicetree/bindings/clock/qcom,gpucc.txt
+++ b/Documentation/devicetree/bindings/clock/qcom,gpucc.txt
@@ -17,6 +17,6 @@ Example:
 		#clock-cells = <1>;
 		#reset-cells = <1>;
 		#power-domain-cells = <1>;
-		clocks = <&xo_board>;
+		clocks = <&rpmhcc RPMH_CXO_CLK>;
 		clock-names = "xo";
 	};
-- 
2.20.0.rc0.387.gc7a69e6b6c-goog

[PATCH 2/2] arm64: dts: sdm845: Add gpu clock controller node

[Douglas Anderson]

Add the GPU clock controller nodes as per the example.

Signed-off-by: Douglas Anderson <dianders@chromium.org>
---

 arch/arm64/boot/dts/qcom/sdm845.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 1419b0098cb3..300688e92439 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/clock/qcom,dispcc-sdm845.h>
 #include <dt-bindings/clock/qcom,gcc-sdm845.h>
+#include <dt-bindings/clock/qcom,gpucc-sdm845.h>
 #include <dt-bindings/clock/qcom,rpmh.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/phy/phy-qcom-qusb2.h>
@@ -1078,6 +1079,16 @@
 			};
 		};
 
+		gpucc: clock-controller@5090000 {
+			compatible = "qcom,sdm845-gpucc";
+			reg = <0x5090000 0x9000>;
+			#clock-cells = <1>;
+			#reset-cells = <1>;
+			#power-domain-cells = <1>;
+			clocks = <&rpmhcc RPMH_CXO_CLK>;
+			clock-names = "xo";
+		};
+
 		usb_1_hsphy: phy@88e2000 {
 			compatible = "qcom,sdm845-qusb2-phy";
 			reg = <0x88e2000 0x400>;
-- 
2.20.0.rc0.387.gc7a69e6b6c-goog

Re: [PATCH 1/2] dt-bindings: clock: qcom: Fix the xo parent in gpucc example

[Stephen Boyd]

Quoting Douglas Anderson (2018-11-28 10:57:42)
> diff --git a/Documentation/devicetree/bindings/clock/qcom,gpucc.txt b/Documentation/devicetree/bindings/clock/qcom,gpucc.txt
> index 9d0358cc08b4..4e5215ef1acd 100644
> --- a/Documentation/devicetree/bindings/clock/qcom,gpucc.txt
> +++ b/Documentation/devicetree/bindings/clock/qcom,gpucc.txt
> @@ -17,6 +17,6 @@ Example:
>                 #clock-cells = <1>;
>                 #reset-cells = <1>;
>                 #power-domain-cells = <1>;
> -               clocks = <&xo_board>;
> +               clocks = <&rpmhcc RPMH_CXO_CLK>;

I don't think it really matters, but ok whatever. Don't mind me
shuffling patches over here.

Applied to clk-next.