Update the GPU bindings and document the new bindings for the GMU
device found with Adreno a6xx targets.

Signed-off-by: Jordan Crouse <jcro...@codeaurora.org>
---

v7: Updated the GMU compatible string and clarified details about when clocks
can be optional on the GPU

 .../devicetree/bindings/display/msm/gmu.txt   | 59 +++++++++++++++++++
 .../devicetree/bindings/display/msm/gpu.txt   | 42 ++++++++++++-
 2 files changed, 98 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/msm/gmu.txt

diff --git a/Documentation/devicetree/bindings/display/msm/gmu.txt 
b/Documentation/devicetree/bindings/display/msm/gmu.txt
new file mode 100644
index 000000000000..59e6865898f2
--- /dev/null
+++ b/Documentation/devicetree/bindings/display/msm/gmu.txt
@@ -0,0 +1,59 @@
+Qualcomm adreno/snapdragon GMU (Graphics management unit)
+
+The GMU is a programmable power controller for the GPU. the CPU controls the
+GMU which in turn handles power controls for the GPU.
+
+Required properties:
+- compatible: "qcom,adreno-gmu-XYZ.W", "qcom,adreno-gmu"
+    for example: "qcom,adreno-gmu-630.2", "qcom,adreno-gmu"
+  Note that you need to list the less specific "qcom,adreno-gmu"
+  for generic matches and the more specific identifier to identify
+  the specific device.
+- reg: Physical base address and length of the GMU registers.
+- reg-names: Matching names for the register regions
+  * "gmu"
+  * "gmu_pdc"
+  * "gmu_pdc_seg"
+- interrupts: The interrupt signals from the GMU.
+- interrupt-names: Matching names for the interrupts
+  * "hfi"
+  * "gmu"
+- clocks: phandles to the device clocks
+- clock-names: Matching names for the clocks
+   * "gmu"
+   * "cxo"
+   * "axi"
+   * "mnoc"
+- power-domains: should be <&clock_gpucc GPU_CX_GDSC>
+- iommus: phandle to the adreno iommu
+- operating-points-v2: phandle to the OPP operating points
+
+Example:
+
+/ {
+       ...
+
+       gmu: gmu@506a000 {
+               compatible="qcom,adreno-gmu-630.2", "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 = <&gpucc GPU_CC_CX_GMU_CLK>,
+                       <&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 = <&gpucc GPU_CX_GDSC>;
+               iommus = <&adreno_smmu 5>;
+
+               operating-points-v2 = <&gmu_opp_table>;
+       };
+};
diff --git a/Documentation/devicetree/bindings/display/msm/gpu.txt 
b/Documentation/devicetree/bindings/display/msm/gpu.txt
index 4ad5e70e5c3e..9c89f4fdb8ca 100644
--- a/Documentation/devicetree/bindings/display/msm/gpu.txt
+++ b/Documentation/devicetree/bindings/display/msm/gpu.txt
@@ -8,14 +8,23 @@ Required properties:
   with the chip-id.
 - reg: Physical base address and length of the controller's registers.
 - interrupts: The interrupt signal from the gpu.
-- clocks: device clocks
+- clocks: device clocks (if applicable)
   See ../clocks/clock-bindings.txt for details.
-- clock-names: the following clocks are required:
+- clock-names: the following clocks are required by a3xx, a4xx and a5xx
+  cores:
   * "core"
   * "iface"
   * "mem_iface"
+  For GMU attached devices the GPU clocks are not used and are not required. 
The
+  following devices should not list clocks:
+   - qcom,adreno-630.2
+- iommus: optional phandle to an adreno iommu instance
+- operating-points-v2: optional phandle to the OPP operating points
+- qcom,gmu: For GMU attached devices a phandle to the GMU device that will
+  control the power for the GPU. Applicable targets:
+    - qcom,adreno-630.2
 
-Example:
+Example 3xx/4xx/a5xx:
 
 / {
        ...
@@ -35,3 +44,30 @@ Example:
                    <&mmcc MMSS_IMEM_AHB_CLK>;
        };
 };
+
+Example a6xx (with GMU):
+
+/ {
+       ...
+
+       gpu@5000000 {
+               compatible = "qcom,adreno-630.2", "qcom,adreno";
+               #stream-id-cells = <16>;
+
+               reg = <0x5000000 0x40000>, <0x509e000 0x10>;
+               reg-names = "kgsl_3d0_reg_memory", "cx_mem";
+
+               /*
+                * Look ma, no clocks! The GPU clocks and power are
+                * controlled entirely by the GMU
+                */
+
+               interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
+
+               iommus = <&adreno_smmu 0>;
+
+               operating-points-v2 = <&gpu_opp_table>;
+
+               qcom,gmu = <&gmu>;
+       };
+};
-- 
2.18.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to