arm64: dts: qcom: msm8916: Update hexagon node

It's necessary to reference the xo clock and cx supply, so specify these
in the node. Also move the Hexagon smd-edge into the hexagon node, to
enable SSR.

As cxo is not yet available we reference the fixed version of cxo for
now, which will work until proper power management is implemented.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Andy Gross <andy.gross@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 93f302682a35fbd23f6a7ae2e39ff0af4d5ebb2a..ab3093995ded75d7784946376b3bda12fc90b649 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -833,8 +833,9 @@
 
                        clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
                                 <&gcc GCC_MSS_Q6_BIMC_AXI_CLK>,
-                                <&gcc GCC_BOOT_ROM_AHB_CLK>;
-                       clock-names = "iface", "bus", "mem";
+                                <&gcc GCC_BOOT_ROM_AHB_CLK>,
+                                <&xo_board>;
+                       clock-names = "iface", "bus", "mem", "xo";
 
                        qcom,smem-states = <&hexagon_smp2p_out 0>;
                        qcom,smem-state-names = "stop";
@@ -842,6 +843,7 @@
                        resets = <&scm 0>;
                        reset-names = "mss_restart";
 
+                       cx-supply = <&pm8916_s1>;
                        mx-supply = <&pm8916_l3>;
                        pll-supply = <&pm8916_l7>;
 
@@ -856,6 +858,16 @@
                        mpss {
                                memory-region = <&mpss_mem>;
                        };
+
+                       smd-edge {
+                               interrupts = <0 25 IRQ_TYPE_EDGE_RISING>;
+
+                               qcom,smd-edge = <0>;
+                               qcom,ipc = <&apcs 8 12>;
+                               qcom,remote-pid = <1>;
+
+                               label = "hexagon";
+                       };
                };
 
                pronto: wcnss@a21b000 {
@@ -1214,14 +1226,6 @@
                                };
                        };
                };
-
-               hexagon {
-                       interrupts = <0 25 IRQ_TYPE_EDGE_RISING>;
-
-                       qcom,smd-edge = <0>;
-                       qcom,ipc = <&apcs 8 12>;
-                       qcom,remote-pid = <1>;
-               };
        };
 
        hexagon-smp2p {