On 08/08/18 23:47, Jordan Crouse wrote:
Add the nodes to describe the Adreno GPU and GMU devices.

Signed-off-by: Jordan Crouse <jcro...@codeaurora.org>
---
  arch/arm64/boot/dts/qcom/sdm845.dtsi | 121 +++++++++++++++++++++++++++
  1 file changed, 121 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi 
b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index cdaabeb3c995..9fb90bb4ea1f 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -323,5 +323,126 @@
                                status = "disabled";
                        };
                };
+
+               adreno_smmu: arm,smmu-adreno@5040000 {
+                       compatible = "qcom,msm8996-smmu-v2";

Per the binding, this should be:

        compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2";

(note that even with Vivek's series the driver won't actually match the SoC-specific string until we find a real need to)

+                       reg = <0x5040000 0x10000>;
+                       #iommu-cells = <1>;
+               #global-interrupts = <2>;

Indentation?

+                       interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>,

And here?

Otherwise, assuming the table walk really isn't cache-coherent, and the global and CB interrupts really do have different triggers (yuck :P), the SMMU parts look fine to me.

Robin.

+                            <GIC_SPI 364 IRQ_TYPE_EDGE_RISING>,
+                            <GIC_SPI 365 IRQ_TYPE_EDGE_RISING>,
+                            <GIC_SPI 366 IRQ_TYPE_EDGE_RISING>,
+                            <GIC_SPI 367 IRQ_TYPE_EDGE_RISING>,
+                            <GIC_SPI 368 IRQ_TYPE_EDGE_RISING>,
+                            <GIC_SPI 369 IRQ_TYPE_EDGE_RISING>,
+                            <GIC_SPI 370 IRQ_TYPE_EDGE_RISING>,
+                            <GIC_SPI 371 IRQ_TYPE_EDGE_RISING>;
+                       clocks = <&clock_gcc GCC_GPU_MEMNOC_GFX_CLK>,
+                               <&clock_gcc GCC_GPU_CFG_AHB_CLK>;
+                       clock-names = "bus", "iface";
+
+                       power-domains = <&clock_gpucc GPU_CX_GDSC>;
+               };
+
+               gpu_opp_table: adreno-opp-table {
+                       compatible = "operating-points-v2";
+
+                       opp-710000000 {
+                               opp-hz = /bits/ 64 <710000000>;
+                               qcom,level = <416>;
+                       };
+
+                       opp-675000000 {
+                               opp-hz = /bits/ 64 <675000000>;
+                               qcom,level = <384>;
+                       };
+
+                       opp-596000000 {
+                               opp-hz = /bits/ 64 <596000000>;
+                               qcom,level = <320>;
+                       };
+
+                       opp-520000000 {
+                               opp-hz = /bits/ 64 <520000000>;
+                               qcom,level = <256>;
+                       };
+
+                       opp-414000000 {
+                               opp-hz = /bits/ 64 <414000000>;
+                               qcom,level = <192>;
+                       };
+
+                       opp-342000000 {
+                               opp-hz = /bits/ 64 <342000000>;
+                               qcom,level = <128>;
+                       };
+
+                       opp-257000000 {
+                               opp-hz = /bits/ 64 <257000000>;
+                               qcom,level = <64>;
+                       };
+               };
+
+               gpu@5000000 {
+                       compatible = "qcom,adreno-630.2", "qcom,adreno";
+                       #stream-id-cells = <16>;
+
+                       reg = <0x5000000 0x40000>;
+                       reg-names = "kgsl_3d0_reg_memory";
+
+                       /*
+                        * Look ma, no clocks! The GPU clocks and power are
+                        * controlled entirely by the GMU
+                        */
+
+                       interrupts = <0 300 0>;
+                       interrupt-names = "kgsl_3d0_irq";
+
+                       iommus = <&adreno_smmu 0>;
+
+                       operating-points-v2 = <&gpu_opp_table>;
+
+                       qcom,gmu = <&gmu>;
+               };
+
+               gmu_opp_table: adreno-gmu-opp-table {
+                       compatible = "operating-points-v2";
+
+                       opp-400000000 {
+                               opp-hz = /bits/ 64 <400000000>;
+                               qcom,level = <128>;
+                       };
+
+                       opp-200000000 {
+                               opp-hz = /bits/ 64 <200000000>;
+                               qcom,level = <48>;
+                       };
+               };
+
+               gmu: gmu@506a000 {
+                       compatible="qcom,adreno-gmu";
+
+                       reg = <0x506a000 0x30000>,
+                               <0xb280000 0x10000>,
+                               <0xb480000 0x10000>;
+                       reg-names = "gmu", "gmu_pdc", "gmu_pdc_seq";
+
+                       interrupts = <GIC_SPI 304 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 305 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "hfi", "gmu";
+
+                       clocks = <&clock_gpucc GPU_CC_CX_GMU_CLK>,
+                               <&clock_gpucc GPU_CC_CXO_CLK>,
+                               <&gcc GCC_DDRSS_GPU_AXI_CLK>,
+                               <&gcc GCC_GPU_MEMNOC_GFX_CLK>;
+                       clock-names = "gmu", "cxo", "axi", "memnoc";
+
+                       power-domains = <&clock_gpucc GPU_CX_GDSC>;
+                       iommus = <&adreno_smmu 5>;
+
+                       operating-points-v2 = <&gmu_opp_table>;
+               };
        };
  };

_______________________________________________
Freedreno mailing list
Freedreno@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/freedreno

Reply via email to