diff --git a/drivers/gpu/nvgpu/os/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c
index 2bb521963..022632403 100644
--- a/drivers/gpu/nvgpu/os/linux/driver_common.c
+++ b/drivers/gpu/nvgpu/os/linux/driver_common.c
@@ -191,6 +191,12 @@ static void nvgpu_init_pm_vars(struct gk20a *g)
 	g->elcg_enabled =
 		nvgpu_platform_is_silicon(g) ? platform->enable_elcg : false;
 
+	/* disable devfreq for pre-silicon */
+	if (!nvgpu_platform_is_silicon(g)) {
+		platform->devfreq_governor = NULL;
+		platform->qos_notify = NULL;
+	}
+
 	nvgpu_set_enabled(g, NVGPU_GPU_CAN_ELCG,
 		nvgpu_platform_is_silicon(g) ? platform->can_elcg : false);
 	nvgpu_set_enabled(g, NVGPU_GPU_CAN_SLCG,
diff --git a/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
index 6a4b8889d..c24d664f2 100644
--- a/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
@@ -676,10 +676,9 @@ struct gk20a_platform ga10b_tegra_platform = {
 	.initscale = ga10b_tegra_scale_init,
 	.prescale = gp10b_tegra_prescale,
 	.postscale = gp10b_tegra_postscale,
-	/* Enable ga10b frequency scaling - JIRA NVGPU-4683 */
-	/* Disable frequency scaling */
-	.devfreq_governor = NULL,
-	.qos_notify = NULL,
+	.devfreq_governor = "nvhost_podgov",
+
+	.qos_notify = gk20a_scale_qos_notify,
 
 	.dump_platform_dependencies = gk20a_tegra_debug_dump,