diff --git a/drivers/platform/tegra/nvadsp/dev-t18x.c b/drivers/platform/tegra/nvadsp/dev-t18x.c
index f1510184..c9fa4d91 100644
--- a/drivers/platform/tegra/nvadsp/dev-t18x.c
+++ b/drivers/platform/tegra/nvadsp/dev-t18x.c
@@ -629,6 +629,11 @@ static int nvadsp_dev_t18x_init(struct platform_device *pdev)
 	struct device *dev = &pdev->dev;
 	int ret = 0;
 
+	d->set_boot_vec     = __set_boot_vec_t18x;
+	d->set_boot_freqs   = __set_boot_freqs_t18x;
+	d->check_wfi_status = __check_wfi_status_t18x;
+	d->dump_core_state  = __dump_core_state_t18x;
+
 #ifdef CONFIG_TEGRA_VIRT_AUDIO_IVC
 
 	if (is_tegra_hypervisor_mode()) {
@@ -639,11 +644,6 @@ static int nvadsp_dev_t18x_init(struct platform_device *pdev)
 	}
 #endif
 
-	d->set_boot_vec     = __set_boot_vec_t18x;
-	d->set_boot_freqs   = __set_boot_freqs_t18x;
-	d->check_wfi_status = __check_wfi_status_t18x;
-	d->dump_core_state  = __dump_core_state_t18x;
-
 	d->assert_adsp = __assert_t18x_adsp;
 	d->deassert_adsp = __deassert_t18x_adsp;
 	d->adspall_rst = devm_reset_control_get(dev, "adspall");