From 090a78fc7cfc95fb38238d6b5c898c8d6ef62982 Mon Sep 17 00:00:00 2001
From: Amit Kushwaha <amitkush@qti.qualcomm.com>
Date: Fri, 23 Jul 2021 16:50:37 +0530
Subject: [PATCH 1/2] ARM: dts: msm: Add gpu-models property for yupik gpu

Add gpu-models support for yupik gpu to specify different
gpu model names and vulkan device IDs.

Change-Id: Ie6340e55bc29f964a5058e77ced02ece764f4c89
---
 qcom/yupik-gpu.dtsi | 24 ++++++++++++++++++++++--
 qcom/yupik.dtsi     |  5 +++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/qcom/yupik-gpu.dtsi b/qcom/yupik-gpu.dtsi
index c6542a40b826..c8a93bd66ed6 100644
--- a/qcom/yupik-gpu.dtsi
+++ b/qcom/yupik-gpu.dtsi
@@ -57,8 +57,8 @@
 		qcom,min-access-length = <32>;
 		qcom,ubwc-mode = <3>;
 
-		nvmem-cells = <&gpu_speed_bin>, <&gpu_gaming_bin>;
-		nvmem-cell-names = "speed_bin", "gaming_bin";
+		nvmem-cells = <&gpu_speed_bin>, <&gpu_gaming_bin>, <&gpu_model_bin>;
+		nvmem-cell-names = "speed_bin", "gaming_bin", "gpu_model";
 
 		qcom,tzone-names = "gpuss-0-usr", "gpuss-1-usr";
 
@@ -119,6 +119,26 @@
 			};
 		};
 
+		qcom,gpu-models {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible="qcom,gpu-models";
+
+			qcom,gpu-model@0 {
+				compatible="qcom,adreno-gpu-a643";
+				qcom,gpu-model-id = <172>;
+				qcom,gpu-model = "Adreno643v1";
+				qcom,vk-device-id = <0x06030501>;
+			};
+
+			qcom,gpu-model@1 {
+				compatible="qcom,adreno-gpu-a643";
+				qcom,gpu-model-id = <190>;
+				qcom,gpu-model = "Adreno643v1";
+				qcom,vk-device-id = <0x06030501>;
+			};
+		};
+
 		qcom,gpu-mempools {
 			#address-cells = <1>;
 			#size-cells = <0>;
diff --git a/qcom/yupik.dtsi b/qcom/yupik.dtsi
index 458ae1fc0cb8..e0e6a00dbd12 100644
--- a/qcom/yupik.dtsi
+++ b/qcom/yupik.dtsi
@@ -5047,6 +5047,11 @@
 			bits = <5 1>;
 		};
 
+		gpu_model_bin: gpu_model_bin@1e9 {
+			reg = <0x1e9 0x2>;
+			bits = <5 8>;
+		};
+
 		feat_conf_m7: feat_conf_m7@6020 {
 			reg = <0x6020 0x4>;
 		};

From 3c35317d06f5660059387c73975917c30fa34489 Mon Sep 17 00:00:00 2001
From: Pankaj Gupta <gpankaj@qti.qualcomm.com>
Date: Wed, 18 Aug 2021 18:52:25 +0530
Subject: [PATCH 2/2] ARM: dts: msm: Add GPU revision for Yupik A643 target

Add compatible string for a643 GPU.

Change-Id: I5f1478b591208de4df58b6754dfde8f50c22eb7b
---
 bindings/gpu/adreno.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bindings/gpu/adreno.txt b/bindings/gpu/adreno.txt
index e828d5e1439d..9161b8075a6e 100644
--- a/bindings/gpu/adreno.txt
+++ b/bindings/gpu/adreno.txt
@@ -8,6 +8,7 @@ Required properties:
 			Must include "qcom,adreno-gpu-a619-holi" for Holi target.
 			Must include "qcom,adreno-gpu-a642" for Shima target.
 			Must include "qcom,adreno-gpu-a642l" for Yupik target.
+			Must include "qcom,adreno-gpu-a643" for Yupik a643 target.
 - reg:			Specifies the list of register regions for the device.
 - reg-names:		Resource names used for the register regions specified
 			in reg.