diff --git a/bindings/gpu/adreno-gmu.txt b/bindings/gpu/adreno-gmu.txt
index 3f94116a..96f60614 100644
--- a/bindings/gpu/adreno-gmu.txt
+++ b/bindings/gpu/adreno-gmu.txt
@@ -5,6 +5,8 @@ Required properties:
 	- "qcom,gpu-gmu"
 	- "qcom,gpu-gmu-hwsched"
 	- "qcom,gpu-rgmu"
+	- "qcom,genc-gmu"
+	- "qcom,genc-gmu-hwsched"
 	- "qcom,gen7-gmu"
 	- "qcom,gen7-gmu-hwsched"
 - reg:		Specifies the GMU register base address and size.
diff --git a/bindings/gpu/adreno.txt b/bindings/gpu/adreno.txt
index b7ac4599..f5e77970 100644
--- a/bindings/gpu/adreno.txt
+++ b/bindings/gpu/adreno.txt
@@ -7,8 +7,10 @@ Required properties:
 			May also includes "qcom,adreno-gpu-*" for few targets.
 			Must include "qcom,adreno-gpu-a619-holi" for Holi target.
 			Must include "qcom,adreno-gpu-a660-shima" for Shima target.
-			Must include "qcom,adreno-gpu-gen7-0-0" for Waipio target.
-			Must include "qcom,adreno-gpu-gen7-0-1" for Waipio V2 target.
+			Must include "qcom,adreno-gpu-c500" and
+				"qcom,adreno-gpu-gen7-0-0" for Waipio target.
+			Must include "qcom,adreno-gpu-c500v2" and
+				"qcom,adreno-gpu-gen7-0-1" for Waipio V2 target.
 - reg:			Specifies the list of register regions for the device.
 - reg-names:		Resource names used for the register regions specified
 			in reg.
diff --git a/qcom/waipio-gpu.dtsi b/qcom/waipio-gpu.dtsi
index 5a283ae3..718bb12a 100644
--- a/qcom/waipio-gpu.dtsi
+++ b/qcom/waipio-gpu.dtsi
@@ -3,7 +3,7 @@
 
 &soc {
 	msm_gpu: qcom,kgsl-3d0@3d00000 {
-		compatible = "qcom,adreno-gpu-gen7-0-0", "qcom,kgsl-3d0";
+		compatible = "qcom,adreno-gpu-c500", "qcom,adreno-gpu-gen7-0-0", "qcom,kgsl-3d0";
 		status = "ok";
 		reg = <0x3d00000 0x40000>, <0x3d61000 0x800>,
 			<0x03d50000 0x10000>, <0x3d8b000 0x2000>,
@@ -246,7 +246,7 @@
 	};
 
 	gmu: qcom,gmu@3d69000 {
-		compatible = "qcom,gen7-gmu";
+		compatible = "qcom,genc-gmu", "qcom,gen7-gmu";
 
 		reg = <0x3d68000 0x37000>,
 		      <0xb290000 0x10000>,
diff --git a/qcom/waipio-v2-gpu.dtsi b/qcom/waipio-v2-gpu.dtsi
index 879ff62a..e9b45029 100644
--- a/qcom/waipio-v2-gpu.dtsi
+++ b/qcom/waipio-v2-gpu.dtsi
@@ -1,6 +1,6 @@
 &msm_gpu {
 
-	compatible = "qcom,adreno-gpu-gen7-0-1", "qcom,kgsl-3d0";
+	compatible = "qcom,adreno-gpu-c500v2", "qcom,adreno-gpu-gen7-0-1", "qcom,kgsl-3d0";
 
 	qcom,initial-pwrlevel = <9>;