arm64: dts: qcom: sc7280: Add ZAP shader support

Non-Chrome SC7280-family platforms ship a ZAP shader with the Adreno GPU.
Describe that and make sure it doesn't interfere with Chrome devices.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20230926-topic-a643-v2-1-06fa3d899c0a@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
index 5d462ae14ba12250ccd2d75eecb6b4f64708aa37..88fc67c3646e5cd9fc479500fc139b4f5254812d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
@@ -17,6 +17,8 @@
  * required by the setup for Chrome boards.
  */
 
+/delete-node/ &gpu_zap_mem;
+/delete-node/ &gpu_zap_shader;
 /delete-node/ &hyp_mem;
 /delete-node/ &xbl_mem;
 /delete-node/ &reserved_xbl_uefi_log;

diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index a150131d4a8de5cd4a7e1c240614bfe11ce66c37..8af11b8cbdc09ac8298e475ada5f71f57f28121b 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -153,6 +153,11 @@
                        no-map;
                };
 
+               gpu_zap_mem: zap@8b71a000 {
+                       reg = <0 0x8b71a000 0 0x2000>;
+                       no-map;
+               };
+
                rmtfs_mem: memory@9c900000 {
                        compatible = "qcom,rmtfs-mem";
                        reg = <0x0 0x9c900000 0x0 0x280000>;
@@ -2614,6 +2619,10 @@
                        nvmem-cells = <&gpu_speed_bin>;
                        nvmem-cell-names = "speed_bin";
 
+                       gpu_zap_shader: zap-shader {
+                               memory-region = <&gpu_zap_mem>;
+                       };
+
                        gpu_opp_table: opp-table {
                                compatible = "operating-points-v2";