diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c
index 850805e60..1787f5734 100644
--- a/drivers/gpu/nvgpu/gk20a/hal.c
+++ b/drivers/gpu/nvgpu/gk20a/hal.c
@@ -67,10 +67,6 @@ int gpu_init_hal(struct gk20a *g)
 		if (NVGPU_NEXT_INIT_HAL(g))
 			return -ENODEV;
 		break;
-	case NVGPU_GPUID_NEXT_2:
-		if (NVGPU_NEXT_2_INIT_HAL(g))
-			return -ENODEV;
-		break;
 #endif
 
 	default:
diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c
index 5cffc69ba..2b50d339d 100644
--- a/drivers/gpu/nvgpu/gp106/acr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c
@@ -215,11 +215,6 @@ int fecs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img)
 					NVGPU_GPU_NEXT_FECS_UCODE_SIG,
 					NVGPU_REQUEST_FIRMWARE_NO_SOC);
 			break;
-		case NVGPU_GPUID_NEXT_2:
-			fecs_sig = nvgpu_request_firmware(g,
-					NVGPU_GPU_NEXT_FECS_UCODE_SIG_2,
-					NVGPU_REQUEST_FIRMWARE_NO_SOC);
-			break;
 #endif
 		default:
 			nvgpu_err(g, "no support for GPUID %x", ver);
@@ -323,11 +318,6 @@ int gpccs_ucode_details(struct gk20a *g, struct flcn_ucode_img_v1 *p_img)
 					NVGPU_GPU_NEXT_GPCCS_UCODE_SIG,
 					NVGPU_REQUEST_FIRMWARE_NO_SOC);
 			break;
-		case NVGPU_GPUID_NEXT_2:
-			gpccs_sig = nvgpu_request_firmware(g,
-					NVGPU_GPU_NEXT_GPCCS_UCODE_SIG_2,
-					NVGPU_REQUEST_FIRMWARE_NO_SOC);
-			break;
 #endif
 		default:
 			nvgpu_err(g, "no support for GPUID %x", ver);