In order to reduce duplication, move common GPU memory configuration
from individual board files to sdm670.dtsi.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 1 -
arch/arm64/boot/dts/qcom/sdm670.dtsi | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts b/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts
index d01422844fbfdec6b4944378a16d9458a4c00bba..760f21f19ca472d620ab1a0703de6e0d69237b55 100644
--- a/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts
+++ b/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts
@@ -406,7 +406,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sdm670/sargo/a615_zap.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sdm670.dtsi b/arch/arm64/boot/dts/qcom/sdm670.dtsi
index c3264a31bccf25fca9eae7fa7734ff43c9db410a..57a3ffedc432b08aa7d7918c9bd0f9714dbb3951 100644
--- a/arch/arm64/boot/dts/qcom/sdm670.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm670.dtsi
@@ -1382,6 +1382,10 @@ gpu: gpu@5000000 {
status = "disabled";
+ zap-shader {
+ memory-region = <&gpu_mem>;
+ };
+
gpu_opp_table: opp-table {
compatible = "operating-points-v2";
--
2.47.3