arm64: dts: qcom: sc8180x: create common zap-shader node

In order to reduce duplication, move common GPU memory configuration
from individual board files to sc8180x.dtsi.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: David Heidelberg <david@ixit.cz>
Link: https://lore.kernel.org/r/20251028-dt-zap-shader-v1-3-7eccb823b986@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
index 08d0784d0cbb899b021198bd85e26f1a93861713..625a155a584ae4ca14c6f373ef21b773ea7311cb 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
@@ -151,11 +151,6 @@
                        no-map;
                };
 
-               gpu_mem: gpu-region@98715000 {
-                       reg = <0x0 0x98715000 0x0 0x2000>;
-                       no-map;
-               };
-
                cdsp_mem: cdsp-region@98900000 {
                        reg = <0x0 0x98900000 0x0 0x1400000>;
                        no-map;
@@ -357,7 +352,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sc8180x/LENOVO/82AK/qcdxkmsuc8180.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e14931efe1fe1a69fc 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
@@ -14,6 +14,8 @@
 #include "sc8180x.dtsi"
 #include "sc8180x-pmics.dtsi"
 
+/delete-node/ &gpu_mem;
+
 / {
        model = "Qualcomm SC8180x Primus";
        compatible = "qcom,sc8180x-primus", "qcom,sc8180x";
@@ -444,7 +446,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sc8180x/qcdxkmsuc8180.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
index e3143a4a41c948cf4ddbf4b137a1323366566fdc..42ab76d52ae21c39d5855e20e11f9cb2319f3afa 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
@@ -646,6 +646,11 @@
                        no-map;
                };
 
+               gpu_mem: memory@98715000 {
+                       reg = <0x0 0x98715000 0x0 0x2000>;
+                       no-map;
+               };
+
                reserved@9d400000 {
                        reg = <0x0 0x9d400000 0x0 0x1000000>;
                        no-map;
@@ -2274,6 +2279,10 @@
 
                        status = "disabled";
 
+                       zap-shader {
+                               memory-region = <&gpu_mem>;
+                       };
+
                        gpu_opp_table: opp-table {
                                compatible = "operating-points-v2";