diff --git a/arch/arm64/boot/dts/qcom/msm8953-asus-ze520kl.dts b/arch/arm64/boot/dts/qcom/msm8953-asus-ze520kl.dts
index 20afd315be8a2f..46d58d6e741a89 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-asus-ze520kl.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-asus-ze520kl.dts
@@ -18,3 +18,7 @@
 &sound_card {
 	model = "asus-ze520kl";
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/asus/ze520kl/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953-asus-ze552kl.dts b/arch/arm64/boot/dts/qcom/msm8953-asus-ze552kl.dts
index 37cf81edc5a530..785cdd8366737d 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-asus-ze552kl.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-asus-ze552kl.dts
@@ -18,3 +18,7 @@
 &sound_card {
 	model = "asus-ze552kl";
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/asus/ze552kl/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953-huawei-milan.dts b/arch/arm64/boot/dts/qcom/msm8953-huawei-milan.dts
index fff42d3f1b7205..7ec2a1718dc095 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-huawei-milan.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-huawei-milan.dts
@@ -530,3 +530,7 @@
 	vddpa-supply = <&pm8953_l9>;
 	vdddig-supply = <&pm8953_l5>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/huawei/milan/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953-lenovo-kuntao.dts b/arch/arm64/boot/dts/qcom/msm8953-lenovo-kuntao.dts
index 2afd9e1f7e5fb6..4ff1619a25a665 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-lenovo-kuntao.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-lenovo-kuntao.dts
@@ -238,3 +238,7 @@
 	vddpa-supply = <&pm8953_l9>;
 	vdddig-supply = <&pm8953_l5>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/lenovo/kuntao/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953-motorola-potter.dts b/arch/arm64/boot/dts/qcom/msm8953-motorola-potter.dts
index 43928d1a1cf938..bfa8cfb0f88d5d 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-motorola-potter.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-motorola-potter.dts
@@ -458,3 +458,7 @@
 	vddpa-supply = <&pm8953_l9>;
 	vdddig-supply = <&pm8953_l5>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/motorola/potter/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts
index 217c5d7628ce8a..fa7b0f4d3a763e 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts
@@ -294,3 +294,7 @@
 	qcom,mbhc-vthreshold-high = <91 259 488 488 488>;
 	qcom,mbhc-vthreshold-low = <91 259 488 488 488>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/xiaomi/daisy/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-markw.dts b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-markw.dts
index f8bfeb97e4f500..854fc494400a40 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-markw.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-markw.dts
@@ -315,3 +315,7 @@
 	qcom,mbhc-vthreshold-high = <75 225 450 510 540>;
 	qcom,mbhc-vthreshold-low = <25 200 325 500 530>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/xiaomi/markw/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts
index 4ac3e4b39edc95..6ec4d18a08697c 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts
@@ -273,3 +273,7 @@
 	qcom,mbhc-vthreshold-high = <73 233 438 438 438>;
 	qcom,mbhc-vthreshold-low = <73 233 438 438 438>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/xiaomi/mido/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts
index 217dcb40162bbd..956560a05f4f1c 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts
@@ -279,3 +279,7 @@
 	qcom,mbhc-vthreshold-high = <91 259 488 488 488>;
 	qcom,mbhc-vthreshold-low = <91 259 488 488 488>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/xiaomi/tissot/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts
index b2527830704c1a..10d230f87b06a9 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts
@@ -278,3 +278,7 @@
 	qcom,mbhc-vthreshold-high = <91 259 488 488 488>;
 	qcom,mbhc-vthreshold-low = <91 259 488 488 488>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/xiaomi/vince/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-ysl.dts b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-ysl.dts
index c0dc28347ed7ee..6c8f216092021e 100644
--- a/arch/arm64/boot/dts/qcom/msm8953-xiaomi-ysl.dts
+++ b/arch/arm64/boot/dts/qcom/msm8953-xiaomi-ysl.dts
@@ -229,3 +229,7 @@
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <96 4>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/xiaomi/ysl/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
index 3bec45ff929160..f399d3105ca472 100644
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -1961,7 +1961,7 @@
 
 			status = "okay";
 
-			zap-shader {
+			zap_shader: zap-shader {
 				memory-region = <&zap_shader_region>;
 				firmware-name = "a506_zap.mdt";
 			};
diff --git a/arch/arm64/boot/dts/qcom/sdm450-lenovo-tbx605f.dts b/arch/arm64/boot/dts/qcom/sdm450-lenovo-tbx605f.dts
index 57440cc68b1587..be74da1e484d50 100644
--- a/arch/arm64/boot/dts/qcom/sdm450-lenovo-tbx605f.dts
+++ b/arch/arm64/boot/dts/qcom/sdm450-lenovo-tbx605f.dts
@@ -379,3 +379,7 @@
 	vddpa-supply = <&pm8953_l9>;
 	vdddig-supply = <&pm8953_l5>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/lenovo/tbx605f/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts b/arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts
index 50d2f660489fa9..0b638c95083a9e 100644
--- a/arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts
+++ b/arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts
@@ -351,3 +351,7 @@
 	vddpa-supply = <&pm8953_l9>;
 	vdddig-supply = <&pm8953_l5>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/motorola/ali/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm450-samsung-a6plte-r4.dts b/arch/arm64/boot/dts/qcom/sdm450-samsung-a6plte-r4.dts
index 130f1ff50d44aa..0448d06b4a6408 100644
--- a/arch/arm64/boot/dts/qcom/sdm450-samsung-a6plte-r4.dts
+++ b/arch/arm64/boot/dts/qcom/sdm450-samsung-a6plte-r4.dts
@@ -837,3 +837,7 @@
 	vdddig-supply = <&pm8953_l5>;
 	status = "okay";
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/samsung/a6plte/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm450-xiaomi-rosy.dts b/arch/arm64/boot/dts/qcom/sdm450-xiaomi-rosy.dts
index e93736f1fb6090..c1df70f20acb88 100644
--- a/arch/arm64/boot/dts/qcom/sdm450-xiaomi-rosy.dts
+++ b/arch/arm64/boot/dts/qcom/sdm450-xiaomi-rosy.dts
@@ -206,3 +206,7 @@
 &wcnss_iris {
 	compatible = "qcom,wcn3620";
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/samsung/a6plte/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts b/arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts
index d24f20c677a457..435e5da61d863b 100644
--- a/arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts
+++ b/arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts
@@ -346,3 +346,7 @@
 	vddpa-supply = <&pm8953_l9>;
 	vdddig-supply = <&pm8953_l5>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/fairphone/fp3/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts b/arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts
index c87343f39ac50f..88df6ee807ecc9 100644
--- a/arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts
+++ b/arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts
@@ -463,3 +463,7 @@
 	vddpa-supply = <&pm8953_l9>;
 	vdddig-supply = <&pm8953_l5>;
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/motorola/ocean/a506_zap.mdt";
+};
diff --git a/arch/arm64/boot/dts/qcom/sdm632-xiaomi-onclite.dts b/arch/arm64/boot/dts/qcom/sdm632-xiaomi-onclite.dts
index d71c03710c477d..8ac97032c98154 100644
--- a/arch/arm64/boot/dts/qcom/sdm632-xiaomi-onclite.dts
+++ b/arch/arm64/boot/dts/qcom/sdm632-xiaomi-onclite.dts
@@ -427,3 +427,7 @@
 		bias-pull-down;
 	};
 };
+
+&zap_shader {
+	firmware-name = "qcom/msm8953/xiaomi/onclite/a506_zap.mdt";
+};