diff --git a/arch/arm64/boot/dts/qcom/sdm630-nokia-pl2.dts b/arch/arm64/boot/dts/qcom/sdm630-nokia-pl2.dts
index 05bb126c0999d6..9b2101f57ad865 100644
--- a/arch/arm64/boot/dts/qcom/sdm630-nokia-pl2.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-nokia-pl2.dts
@@ -187,7 +187,7 @@
 };
 
 &adreno_gpu_zap {
-	firmware-name = "a508_zap.mbn";
+	firmware-name = "qcom/sdm630/nokia/pl2/a508_zap.mdt";
 	memory-region = <&zap_shader_region>;
 };
 
diff --git a/arch/arm64/boot/dts/qcom/sdm636-asus-x00td.dts b/arch/arm64/boot/dts/qcom/sdm636-asus-x00td.dts
index f1dd4f500cdbc2..2688686ad29528 100644
--- a/arch/arm64/boot/dts/qcom/sdm636-asus-x00td.dts
+++ b/arch/arm64/boot/dts/qcom/sdm636-asus-x00td.dts
@@ -184,7 +184,7 @@
 
 &adreno_gpu_zap {
 	memory-region = <&zap_shader_region>;
-	firmware-name = "a512_zap.mbn";
+	firmware-name = "qcom/sdm636/asus/x00td/a512_zap.mdt";
 };
 
 &adsp_pil {
diff --git a/arch/arm64/boot/dts/qcom/sdm636-bbry-luna-common.dtsi b/arch/arm64/boot/dts/qcom/sdm636-bbry-luna-common.dtsi
index 1e1082db393166..6c11770d9d078c 100755
--- a/arch/arm64/boot/dts/qcom/sdm636-bbry-luna-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm636-bbry-luna-common.dtsi
@@ -20,7 +20,7 @@
 };
 
 &adreno_gpu_zap {
-	firmware-name = "qcom/sdm636/luna/a512_zap.mbn";
+	firmware-name = "qcom/sdm636/luna/a512_zap.mdt";
 };
 
 &adsp_pil {
diff --git a/arch/arm64/boot/dts/qcom/sdm636-xiaomi-tulip.dts b/arch/arm64/boot/dts/qcom/sdm636-xiaomi-tulip.dts
index cff45e18a7a0f1..1bd6e1da1cd540 100644
--- a/arch/arm64/boot/dts/qcom/sdm636-xiaomi-tulip.dts
+++ b/arch/arm64/boot/dts/qcom/sdm636-xiaomi-tulip.dts
@@ -132,7 +132,7 @@
 };
 
 &adreno_gpu_zap {
-	firmware-name = "a512_zap.mbn";
+	firmware-name = "qcom/sdm636/xiaomi/tulip/a512_zap.mdt";
 };
 
 &blsp_i2c1 {
diff --git a/arch/arm64/boot/dts/qcom/sdm636-xiaomi-whyred.dts b/arch/arm64/boot/dts/qcom/sdm636-xiaomi-whyred.dts
index 1e242f6e1f8e8d..f7f935dc316732 100644
--- a/arch/arm64/boot/dts/qcom/sdm636-xiaomi-whyred.dts
+++ b/arch/arm64/boot/dts/qcom/sdm636-xiaomi-whyred.dts
@@ -152,7 +152,7 @@
 };
 
 &adreno_gpu_zap {
-	firmware-name = "a512_zap.mbn";
+	firmware-name = "qcom/sdm636/xiaomi/whyred/a512_zap.mdt";
 	memory-region = <&zap_shader_region>;
 };
 
diff --git a/arch/arm64/boot/dts/qcom/sdm660-bbry-athena-common.dtsi b/arch/arm64/boot/dts/qcom/sdm660-bbry-athena-common.dtsi
index 2f9930756a7e03..fe6e6edbbd5f2b 100755
--- a/arch/arm64/boot/dts/qcom/sdm660-bbry-athena-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm660-bbry-athena-common.dtsi
@@ -19,7 +19,7 @@
 };
 
 &adreno_gpu_zap {
-	firmware-name = "qcom/sdm660/athena/a512_zap.mbn";
+	firmware-name = "qcom/sdm660/athena/a512_zap.mdt";
 };
 
 &adsp_pil {