Revert "msm: kgsl: force 8960 v1 & v2 to use adreno220"

This reverts commit 8ad6fed70fbd18f4a061be2b3d749d3692dd7f86.

This is no longer needed now that workaround firmware for
8960v2 is available.

Change-Id: I212b7a7e4ef086b25d01d546df63a64505d8d374
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 7516a1f..526c971 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -367,11 +367,6 @@
 	else
 		chipid = (coreid & 0xF) << 24;
 
-	if (cpu_is_msm8960()) {
-		KGSL_DRV_ERR(device, "forcing a220 chipid\n");
-		majorid = 1<<4;
-	}
-
 	chipid |= ((majorid >> 4) & 0xF) << 16;
 
 	minorid = ((revid >> 0)  & 0xFF);