diff --git a/drivers/gpu/nvgpu/Kconfig b/drivers/gpu/nvgpu/Kconfig
index 832d8843b..238c6e113 100644
--- a/drivers/gpu/nvgpu/Kconfig
+++ b/drivers/gpu/nvgpu/Kconfig
@@ -225,3 +225,10 @@ config NVGPU_VPR
 	default y
 	help
 	  Support for NVGPU VPR
+
+config NVGPU_TEGRA_FUSE
+	bool "Tegra fuse Support"
+	depends on GK20A
+	default y
+	help
+	  Support Tegra fuse
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 572048dfa..aa0b3a560 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -428,12 +428,15 @@ endif
 nvgpu-$(CONFIG_TEGRA_GK20A) += \
 	os/linux/module.o \
 	os/linux/module_usermode.o \
-	os/linux/soc.o \
-	os/linux/fuse.o \
 	os/linux/platform_gk20a_tegra.o \
 	os/linux/platform_gp10b_tegra.o \
 	os/linux/platform_gv11b_tegra.o
 
+ifeq ($(CONFIG_TEGRA_GK20A),y)
+nvgpu-$(CONFIG_NVGPU_TEGRA_FUSE) += os/linux/fuse.o \
+				    os/linux/soc.o
+endif
+
 nvgpu-$(CONFIG_SYNC) += \
 	os/linux/sync_sema_android.o \
 	os/linux/os_fence_android.o \
diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs
index c1eb4a540..d3e33fd22 100644
--- a/drivers/gpu/nvgpu/Makefile.shared.configs
+++ b/drivers/gpu/nvgpu/Makefile.shared.configs
@@ -84,6 +84,9 @@ NVGPU_COMMON_CFLAGS             +=      \
 
 endif
 
+CONFIG_NVGPU_TEGRA_FUSE		:= 1
+NVGPU_COMMON_CFLAGS		+= -DCONFIG_NVGPU_TEGRA_FUSE
+
 #
 # Flags enabled only for safety debug and regular build profile.
 #
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources
index 216107127..bd2dc611a 100644
--- a/drivers/gpu/nvgpu/Makefile.sources
+++ b/drivers/gpu/nvgpu/Makefile.sources
@@ -31,7 +31,6 @@ srcs +=	os/posix/nvgpu.c \
 	os/posix/firmware.c \
 	os/posix/soc.c \
 	os/posix/error_notifier.c \
-	os/posix/fuse.c \
 	os/posix/posix-channel.c \
 	os/posix/posix-tsg.c \
 	os/posix/stubs.c \
@@ -43,6 +42,10 @@ ifdef CONFIG_NVGPU_VPR
 srcs += os/posix/posix-vpr.c
 endif
 
+ifdef CONFIG_NVGPU_TEGRA_FUSE
+srcs += os/posix/fuse.c
+endif
+
 ifdef CONFIG_NVGPU_FECS_TRACE
 srcs += os/posix/fecs_trace_posix.c
 endif
diff --git a/drivers/gpu/nvgpu/doxygen/Doxyfile.safety b/drivers/gpu/nvgpu/doxygen/Doxyfile.safety
index bae48c784..6269713cc 100644
--- a/drivers/gpu/nvgpu/doxygen/Doxyfile.safety
+++ b/drivers/gpu/nvgpu/doxygen/Doxyfile.safety
@@ -2056,6 +2056,7 @@ PREDEFINED            += CONFIG_NVGPU_GR_GOLDEN_CTX_VERIFICATION
 PREDEFINED            += NVGPU_IGPU_ISOLATION_SUPPORT
 PREDEFINED            += CONFIG_NVGPU_ISOLATION_SUPPORT
 PREDEFINED            += NVCPU_IS_AARCH64
+PREDEFINED            += CONFIG_NVGPU_TEGRA_FUSE
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/drivers/gpu/nvgpu/hal/clk/clk_gm20b.c b/drivers/gpu/nvgpu/hal/clk/clk_gm20b.c
index 16caecf5a..dfe157fa8 100644
--- a/drivers/gpu/nvgpu/hal/clk/clk_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/clk/clk_gm20b.c
@@ -301,13 +301,6 @@ static int nvgpu_fuse_calib_gpcpll_get_adc(struct gk20a *g,
 	return 0;
 }
 
-#ifdef CONFIG_TEGRA_USE_NA_GPCPLL
-static bool nvgpu_fuse_can_use_na_gpcpll(struct gk20a *g)
-{
-	return nvgpu_tegra_get_gpu_speedo_id(g);
-}
-#endif
-
 /*
  * Read ADC characteristic parmeters from fuses.
  * Determine clibration settings.
@@ -1179,11 +1172,37 @@ struct pll_parms *gm20b_get_gpc_pll_parms(void)
 	return &gpc_pll_params;
 }
 
+#ifdef CONFIG_TEGRA_USE_NA_GPCPLL
+static int nvgpu_fuse_can_use_na_gpcpll(struct gk20a *g, int *id)
+{
+	return nvgpu_tegra_get_gpu_speedo_id(g, id);
+}
+
+static int nvgpu_clk_set_na_gpcpll(struct gk20a *g)
+{
+	struct clk_gk20a *clk = &g->clk;
+	int speedo_id;
+	int err;
+
+	err = nvgpu_fuse_can_use_na_gpcpll(g, &speedo_id);
+	if (err == 0) {
+		/* NA mode is supported only at max update rate 38.4 MHz */
+		if (speedo_id) {
+			WARN_ON(clk->gpc_pll.clk_in != gpc_pll_params.max_u);
+			clk->gpc_pll.mode = GPC_PLL_MODE_DVFS;
+			gpc_pll_params.min_u = gpc_pll_params.max_u;
+		}
+	}
+
+	return err;
+}
+#endif
+
 int gm20b_init_clk_setup_sw(struct gk20a *g)
 {
 	struct clk_gk20a *clk = &g->clk;
 	unsigned long safe_rate;
-	int err;
+	int err = 0;
 
 	nvgpu_log_fn(g, " ");
 
@@ -1236,11 +1255,10 @@ int gm20b_init_clk_setup_sw(struct gk20a *g)
 	  */
 	clk_config_calibration_params(g);
 #ifdef CONFIG_TEGRA_USE_NA_GPCPLL
-	if (nvgpu_fuse_can_use_na_gpcpll(g)) {
-		/* NA mode is supported only at max update rate 38.4 MHz */
-		BUG_ON(clk->gpc_pll.clk_in != gpc_pll_params.max_u);
-		clk->gpc_pll.mode = GPC_PLL_MODE_DVFS;
-		gpc_pll_params.min_u = gpc_pll_params.max_u;
+	err = nvgpu_clk_set_na_gpcpll(g);
+	if (err != 0) {
+		nvgpu_err(g, "NA GPCPLL fuse info. not available");
+		goto fail;
 	}
 #endif
 
diff --git a/drivers/gpu/nvgpu/hal/gr/gr/gr_gm20b.c b/drivers/gpu/nvgpu/hal/gr/gr/gr_gm20b.c
index 79b0e8cf1..3d71c1e26 100644
--- a/drivers/gpu/nvgpu/hal/gr/gr/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/gr/gr/gr_gm20b.c
@@ -1,7 +1,7 @@
 /*
  * GM20B GPC MMU
  *
- * Copyright (c) 2011-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -214,6 +214,7 @@ void gr_gm20b_get_sm_dsm_perf_ctrl_regs(struct gk20a *g,
 	    g->ops.gr.ctxsw_prog.hw_get_perf_counter_control_register_stride();
 }
 
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 void gr_gm20b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index)
 {
 	nvgpu_tegra_fuse_write_bypass(g, 0x1);
@@ -231,6 +232,7 @@ void gr_gm20b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index)
 		nvgpu_tegra_fuse_write_opt_gpu_tpc1_disable(g, 0x0);
 	}
 }
+#endif
 
 static bool gr_gm20b_is_tpc_addr_shared(struct gk20a *g, u32 addr)
 {
diff --git a/drivers/gpu/nvgpu/hal/gr/gr/gr_gm20b.h b/drivers/gpu/nvgpu/hal/gr/gr/gr_gm20b.h
index 279c933c2..f4851918f 100644
--- a/drivers/gpu/nvgpu/hal/gr/gr/gr_gm20b.h
+++ b/drivers/gpu/nvgpu/hal/gr/gr/gr_gm20b.h
@@ -1,7 +1,7 @@
 /*
  * GM20B GPC MMU
  *
- * Copyright (c) 2014-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -48,7 +48,9 @@ void gr_gm20b_get_sm_dsm_perf_ctrl_regs(struct gk20a *g,
 					       u32 *num_sm_dsm_perf_ctrl_regs,
 					       u32 **sm_dsm_perf_ctrl_regs,
 					       u32 *ctrl_register_stride);
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 void gr_gm20b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index);
+#endif
 bool gr_gm20b_is_tpc_addr(struct gk20a *g, u32 addr);
 u32 gr_gm20b_get_tpc_num(struct gk20a *g, u32 addr);
 int gr_gm20b_dump_gr_status_regs(struct gk20a *g,
diff --git a/drivers/gpu/nvgpu/hal/gr/gr/gr_gp10b.c b/drivers/gpu/nvgpu/hal/gr/gr/gr_gp10b.c
index acfee9a02..bd19349d6 100644
--- a/drivers/gpu/nvgpu/hal/gr/gr/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/hal/gr/gr/gr_gp10b.c
@@ -1,7 +1,7 @@
 /*
  * GP10B GPU GR
  *
- * Copyright (c) 2015-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -365,6 +365,7 @@ int gr_gp10b_dump_gr_status_regs(struct gk20a *g,
 	return 0;
 }
 
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 void gr_gp10b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index)
 {
 	nvgpu_tegra_fuse_write_bypass(g, 0x1);
@@ -379,6 +380,7 @@ void gr_gp10b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index)
 		nvgpu_tegra_fuse_write_opt_gpu_tpc0_disable(g, 0x0);
 	}
 }
+#endif
 
 static int gr_gp10b_disable_channel_or_tsg(struct gk20a *g, struct nvgpu_channel *fault_ch)
 {
diff --git a/drivers/gpu/nvgpu/hal/gr/gr/gr_gp10b.h b/drivers/gpu/nvgpu/hal/gr/gr/gr_gp10b.h
index aa3859e9d..2b4687e4e 100644
--- a/drivers/gpu/nvgpu/hal/gr/gr/gr_gp10b.h
+++ b/drivers/gpu/nvgpu/hal/gr/gr/gr_gp10b.h
@@ -1,7 +1,7 @@
 /*
  * GP10B GPU GR
  *
- * Copyright (c) 2015-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -46,7 +46,9 @@ void gr_gp10b_set_alpha_circular_buffer_size(struct gk20a *g, u32 data);
 void gr_gp10b_set_circular_buffer_size(struct gk20a *g, u32 data);
 int gr_gp10b_dump_gr_status_regs(struct gk20a *g,
 			   struct nvgpu_debug_context *o);
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 void gr_gp10b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index);
+#endif
 int gr_gp10b_pre_process_sm_exception(struct gk20a *g,
 		u32 gpc, u32 tpc, u32 sm, u32 global_esr, u32 warp_esr,
 		bool sm_debugger_attached, struct nvgpu_channel *fault_ch,
diff --git a/drivers/gpu/nvgpu/hal/gr/gr/gr_gv100.c b/drivers/gpu/nvgpu/hal/gr/gr/gr_gv100.c
index a8d619b3f..9cee0491c 100644
--- a/drivers/gpu/nvgpu/hal/gr/gr/gr_gv100.c
+++ b/drivers/gpu/nvgpu/hal/gr/gr/gr_gv100.c
@@ -1,7 +1,7 @@
 /*
  * GV100 GPU GR
  *
- * Copyright (c) 2017-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -40,9 +40,11 @@
 #include <nvgpu/hw/gv100/hw_gr_gv100.h>
 #include <nvgpu/hw/gv100/hw_perf_gv100.h>
 
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 void gr_gv100_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index)
 {
 }
+#endif
 
 static u32 gr_gv100_get_active_fbpa_mask(struct gk20a *g)
 {
diff --git a/drivers/gpu/nvgpu/hal/gr/gr/gr_gv100.h b/drivers/gpu/nvgpu/hal/gr/gr/gr_gv100.h
index 160d6c6e2..16820f431 100644
--- a/drivers/gpu/nvgpu/hal/gr/gr/gr_gv100.h
+++ b/drivers/gpu/nvgpu/hal/gr/gr/gr_gv100.h
@@ -1,7 +1,7 @@
 /*
  * GV100 GPU GR
  *
- * Copyright (c) 2017-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -31,7 +31,9 @@
 
 struct gk20a;
 
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 void gr_gv100_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index);
+#endif
 void gr_gv100_split_fbpa_broadcast_addr(struct gk20a *g, u32 addr,
 	u32 num_fbpas,
 	u32 *priv_addr_table, u32 *t);
diff --git a/drivers/gpu/nvgpu/hal/gr/gr/gr_gv11b.c b/drivers/gpu/nvgpu/hal/gr/gr/gr_gv11b.c
index 37244da01..c3ef0a261 100644
--- a/drivers/gpu/nvgpu/hal/gr/gr/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/gr/gr/gr_gv11b.c
@@ -413,6 +413,7 @@ int gr_gv11b_dump_gr_status_regs(struct gk20a *g,
 	return 0;
 }
 
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 void gr_gv11b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index)
 {
 	u32 fuse_val;
@@ -437,6 +438,7 @@ void gr_gv11b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index)
 
 	nvgpu_tegra_fuse_write_opt_gpu_tpc0_disable(g, fuse_val);
 }
+#endif
 
 #ifdef CONFIG_NVGPU_DEBUGGER
 static int gr_gv11b_handle_warp_esr_error_mmu_nack(struct gk20a *g,
diff --git a/drivers/gpu/nvgpu/hal/gr/gr/gr_gv11b.h b/drivers/gpu/nvgpu/hal/gr/gr/gr_gv11b.h
index 7dc92ce79..9682209b8 100644
--- a/drivers/gpu/nvgpu/hal/gr/gr/gr_gv11b.h
+++ b/drivers/gpu/nvgpu/hal/gr/gr/gr_gv11b.h
@@ -1,7 +1,7 @@
 /*
  * GV11B GPU GR
  *
- * Copyright (c) 2016-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -35,7 +35,9 @@ void gr_gv11b_set_alpha_circular_buffer_size(struct gk20a *g, u32 data);
 void gr_gv11b_set_circular_buffer_size(struct gk20a *g, u32 data);
 int gr_gv11b_dump_gr_status_regs(struct gk20a *g,
 			   struct nvgpu_debug_context *o);
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 void gr_gv11b_set_gpc_tpc_mask(struct gk20a *g, u32 gpc_index);
+#endif
 int gr_gv11b_pre_process_sm_exception(struct gk20a *g,
 		u32 gpc, u32 tpc, u32 sm, u32 global_esr, u32 warp_esr,
 		bool sm_debugger_attached, struct nvgpu_channel *fault_ch,
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
index e7eedcf9e..064df37b2 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gm20b.c
@@ -200,7 +200,9 @@ static const struct gpu_ops gm20b_ops = {
 		.set_circular_buffer_size = gr_gm20b_set_circular_buffer_size,
 		.get_sm_dsm_perf_regs = gr_gm20b_get_sm_dsm_perf_regs,
 		.get_sm_dsm_perf_ctrl_regs = gr_gm20b_get_sm_dsm_perf_ctrl_regs,
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 		.set_gpc_tpc_mask = gr_gm20b_set_gpc_tpc_mask,
+#endif
 		.is_tpc_addr = gr_gm20b_is_tpc_addr,
 		.get_tpc_num = gr_gm20b_get_tpc_num,
 		.dump_gr_regs = gr_gm20b_dump_gr_status_regs,
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
index 5f856fc4b..178d3e817 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gp10b.c
@@ -248,7 +248,9 @@ static const struct gpu_ops gp10b_ops = {
 		.set_circular_buffer_size = gr_gp10b_set_circular_buffer_size,
 		.get_sm_dsm_perf_regs = gr_gm20b_get_sm_dsm_perf_regs,
 		.get_sm_dsm_perf_ctrl_regs = gr_gm20b_get_sm_dsm_perf_ctrl_regs,
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 		.set_gpc_tpc_mask = gr_gp10b_set_gpc_tpc_mask,
+#endif
 		.is_tpc_addr = gr_gm20b_is_tpc_addr,
 		.get_tpc_num = gr_gm20b_get_tpc_num,
 		.dump_gr_regs = gr_gp10b_dump_gr_status_regs,
diff --git a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
index 23ecf547a..6c65982a9 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_gv11b.c
@@ -310,7 +310,9 @@ NVGPU_COV_WHITELIST_BLOCK_END(NVGPU_MISRA(Rule, 8_7))
 		.set_circular_buffer_size = gr_gv11b_set_circular_buffer_size,
 		.get_sm_dsm_perf_regs = gv11b_gr_get_sm_dsm_perf_regs,
 		.get_sm_dsm_perf_ctrl_regs = gv11b_gr_get_sm_dsm_perf_ctrl_regs,
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 		.set_gpc_tpc_mask = gr_gv11b_set_gpc_tpc_mask,
+#endif
 		.is_tpc_addr = gr_gm20b_is_tpc_addr,
 		.get_tpc_num = gr_gm20b_get_tpc_num,
 		.dump_gr_regs = gr_gv11b_dump_gr_status_regs,
diff --git a/drivers/gpu/nvgpu/hal/init/hal_tu104.c b/drivers/gpu/nvgpu/hal/init/hal_tu104.c
index 30211bbf2..4faa284bf 100644
--- a/drivers/gpu/nvgpu/hal/init/hal_tu104.c
+++ b/drivers/gpu/nvgpu/hal/init/hal_tu104.c
@@ -333,7 +333,9 @@ static const struct gpu_ops tu104_ops = {
 		.set_circular_buffer_size = gr_gv11b_set_circular_buffer_size,
 		.get_sm_dsm_perf_regs = gv11b_gr_get_sm_dsm_perf_regs,
 		.get_sm_dsm_perf_ctrl_regs = gr_tu104_get_sm_dsm_perf_ctrl_regs,
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 		.set_gpc_tpc_mask = gr_gv100_set_gpc_tpc_mask,
+#endif
 		.is_tpc_addr = gr_gm20b_is_tpc_addr,
 		.get_tpc_num = gr_gm20b_get_tpc_num,
 		.dump_gr_regs = gr_gv11b_dump_gr_status_regs,
diff --git a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gp10b.c
index e4d0e1a71..90b285e6b 100644
--- a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gp10b.c
+++ b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gp10b.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -181,7 +181,9 @@ static const struct gpu_ops vgpu_gp10b_ops = {
 		.set_circular_buffer_size = NULL,
 		.get_sm_dsm_perf_regs = gr_gm20b_get_sm_dsm_perf_regs,
 		.get_sm_dsm_perf_ctrl_regs = gr_gm20b_get_sm_dsm_perf_ctrl_regs,
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 		.set_gpc_tpc_mask = NULL,
+#endif
 		.is_tpc_addr = gr_gm20b_is_tpc_addr,
 		.get_tpc_num = gr_gm20b_get_tpc_num,
 		.dump_gr_regs = NULL,
diff --git a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c
index 8370056d7..546d1f436 100644
--- a/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/vgpu/init/vgpu_hal_gv11b.c
@@ -237,7 +237,9 @@ static const struct gpu_ops vgpu_gv11b_ops = {
 		.set_circular_buffer_size = NULL,
 		.get_sm_dsm_perf_regs = gv11b_gr_get_sm_dsm_perf_regs,
 		.get_sm_dsm_perf_ctrl_regs = gv11b_gr_get_sm_dsm_perf_ctrl_regs,
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 		.set_gpc_tpc_mask = NULL,
+#endif
 		.is_tpc_addr = gr_gm20b_is_tpc_addr,
 		.get_tpc_num = gr_gm20b_get_tpc_num,
 		.dump_gr_regs = NULL,
diff --git a/drivers/gpu/nvgpu/include/nvgpu/fuse.h b/drivers/gpu/nvgpu/include/nvgpu/fuse.h
index f0296d514..85ab99a31 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/fuse.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/fuse.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,10 +30,14 @@
 struct gk20a;
 
 #include <nvgpu/types.h>
+#include <nvgpu/errno.h>
+
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 
 #ifdef CONFIG_NVGPU_NON_FUSA
-int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g);
-#endif
+int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g, int *id);
+int nvgpu_tegra_fuse_read_reserved_calib(struct gk20a *g, u32 *val);
+#endif /* CONFIG_NVGPU_NON_FUSA */
 
 /**
  * @brief -  Write Fuse bypass register which controls fuse bypass.
@@ -97,7 +101,50 @@ void nvgpu_tegra_fuse_write_opt_gpu_tpc1_disable(struct gk20a *g, u32 val);
  */
 int nvgpu_tegra_fuse_read_gcplex_config_fuse(struct gk20a *g, u32 *val);
 
+#else /* CONFIG_NVGPU_TEGRA_FUSE */
+
 #ifdef CONFIG_NVGPU_NON_FUSA
-int nvgpu_tegra_fuse_read_reserved_calib(struct gk20a *g, u32 *val);
-#endif
+static inline int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g, int *id)
+{
+	return -EINVAL;
+}
+
+static inline int nvgpu_tegra_fuse_read_reserved_calib(struct gk20a *g,
+						       u32 *val)
+{
+	return -EINVAL;
+}
+#endif /* CONFIG_NVGPU_NON_FUSA */
+
+static inline void nvgpu_tegra_fuse_write_bypass(struct gk20a *g, u32 val)
+{
+}
+
+static inline void nvgpu_tegra_fuse_write_access_sw(struct gk20a *g, u32 val)
+{
+}
+
+static inline void nvgpu_tegra_fuse_write_opt_gpu_tpc0_disable(struct gk20a *g,
+							       u32 val)
+{
+}
+
+static inline void nvgpu_tegra_fuse_write_opt_gpu_tpc1_disable(struct gk20a *g,
+							       u32 val)
+{
+}
+
+static inline int nvgpu_tegra_fuse_read_gcplex_config_fuse(struct gk20a *g,
+							   u32 *val)
+{
+	/*
+	 * Setting gcplex_config fuse to wpr_enabled/vpr_auto_fetch_disable
+	 * by default that is expected on the production chip.
+	 */
+	*val = 0x4;
+
+	return 0;
+}
+
+#endif /* CONFIG_NVGPU_TEGRA_FUSE */
 #endif /* NVGPU_FUSE_H */
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gops_gr.h b/drivers/gpu/nvgpu/include/nvgpu/gops_gr.h
index d21e00752..b50d3664f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gops_gr.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gops_gr.h
@@ -1065,7 +1065,9 @@ struct gops_gr {
 	void (*get_ovr_perf_regs)(struct gk20a *g,
 				  u32 *num_ovr_perf_regs,
 				  u32 **ovr_perf_regsr);
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 	void (*set_gpc_tpc_mask)(struct gk20a *g, u32 gpc_index);
+#endif
 	int (*decode_egpc_addr)(struct gk20a *g,
 				u32 addr, enum ctxsw_addr_type *addr_type,
 				u32 *gpc_num, u32 *tpc_num,
diff --git a/drivers/gpu/nvgpu/include/nvgpu/soc.h b/drivers/gpu/nvgpu/include/nvgpu/soc.h
index c064803bf..6b920b46b 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/soc.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/soc.h
@@ -26,6 +26,7 @@
 
 struct gk20a;
 
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 /**
  * @brief Check whether running on silicon or not.
  *
@@ -114,4 +115,42 @@ bool nvgpu_is_soc_t194_a01(struct gk20a *g);
  */
 int nvgpu_init_soc_vars(struct gk20a *g);
 
+#else /* CONFIG_NVGPU_TEGRA_FUSE */
+
+static inline bool nvgpu_platform_is_silicon(struct gk20a *g)
+{
+	return true;
+}
+
+static inline bool nvgpu_platform_is_simulation(struct gk20a *g)
+{
+	return false;
+}
+
+static inline bool nvgpu_platform_is_fpga(struct gk20a *g)
+{
+	return false;
+}
+
+static inline bool nvgpu_is_hypervisor_mode(struct gk20a *g)
+{
+	return false;
+}
+
+static inline bool nvgpu_is_bpmp_running(struct gk20a *g)
+{
+	return false;
+}
+
+static inline bool nvgpu_is_soc_t194_a01(struct gk20a *g)
+{
+	return false;
+}
+
+static inline int nvgpu_init_soc_vars(struct gk20a *g)
+{
+	return 0;
+}
+#endif /* CONFIG_NVGPU_TEGRA_FUSE */
+
 #endif /* NVGPU_SOC_H */
diff --git a/drivers/gpu/nvgpu/os/linux/fuse.c b/drivers/gpu/nvgpu/os/linux/fuse.c
index 27851f926..3dc2013a7 100644
--- a/drivers/gpu/nvgpu/os/linux/fuse.c
+++ b/drivers/gpu/nvgpu/os/linux/fuse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -15,9 +15,11 @@
 
 #include <nvgpu/fuse.h>
 
-int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g)
+int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g, int *id)
 {
-	return tegra_sku_info.gpu_speedo_id;
+	*id = tegra_sku_info.gpu_speedo_id;
+
+	return 0;
 }
 
 /*
diff --git a/drivers/gpu/nvgpu/os/linux/module.c b/drivers/gpu/nvgpu/os/linux/module.c
index db5f0e388..03bf2113b 100644
--- a/drivers/gpu/nvgpu/os/linux/module.c
+++ b/drivers/gpu/nvgpu/os/linux/module.c
@@ -31,11 +31,13 @@
 #include <linux/of_gpio.h>
 
 #include <uapi/linux/nvgpu.h>
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 #include <dt-bindings/soc/gm20b-fuse.h>
 #include <dt-bindings/soc/gp10b-fuse.h>
 #include <dt-bindings/soc/gv11b-fuse.h>
 
 #include <soc/tegra/fuse.h>
+#endif /* CONFIG_NVGPU_TEGRA_FUSE */
 
 #include <nvgpu/hal_init.h>
 #include <nvgpu/dma.h>
@@ -1134,9 +1136,12 @@ static int gk20a_pm_railgate(struct device *dev)
 #ifdef CONFIG_DEBUG_FS
 	g->pstats.last_rail_gate_complete = jiffies;
 #endif
+
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 	ret = tegra_fuse_clock_disable();
 	if (ret)
 		nvgpu_err(g, "failed to disable tegra fuse clock, err=%d", ret);
+#endif
 
 	return ret;
 }
@@ -1151,11 +1156,14 @@ static int gk20a_pm_unrailgate(struct device *dev)
 	if (!platform->unrailgate)
 		return 0;
 
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 	ret = tegra_fuse_clock_enable();
 	if (ret) {
 		nvgpu_err(g, "failed to enable tegra fuse clock, err=%d", ret);
 		return ret;
 	}
+#endif
+
 #ifdef CONFIG_DEBUG_FS
 	g->pstats.last_rail_ungate_start = jiffies;
 	if (g->pstats.railgating_cycle_count >= 1)
@@ -1505,6 +1513,7 @@ static inline void set_gk20a(struct platform_device *pdev, struct gk20a *gk20a)
 
 static int nvgpu_read_fuse_overrides(struct gk20a *g)
 {
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 	struct device_node *np = nvgpu_get_node(g);
 	struct gk20a_platform *platform = dev_get_drvdata(dev_from_gk20a(g));
 	u32 *fuses;
@@ -1545,7 +1554,7 @@ static int nvgpu_read_fuse_overrides(struct gk20a *g)
 	}
 
 	nvgpu_kfree(g, fuses);
-
+#endif
 	return 0;
 }
 
diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
index dc70f8cd1..d429f6a1e 100644
--- a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c
@@ -36,7 +36,9 @@
 #endif
 
 #include <linux/platform/tegra/tegra_emc.h>
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 #include <soc/tegra/chip-id.h>
+#endif
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/bug.h>
@@ -830,8 +832,10 @@ static int gk20a_tegra_probe(struct device *dev)
 			dev_warn(dev, "board does not support scaling");
 		}
 		platform->g->clk.gpc_pll.id = GM20B_GPC_PLL_B1;
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 		if (tegra_chip_get_revision() > TEGRA210_REVISION_A04p)
 			platform->g->clk.gpc_pll.id = GM20B_GPC_PLL_C1;
+#endif
 	}
 
 	if (platform->platform_chip_id == TEGRA_132)
diff --git a/drivers/gpu/nvgpu/os/linux/scale.c b/drivers/gpu/nvgpu/os/linux/scale.c
index e6599d305..e802d89de 100644
--- a/drivers/gpu/nvgpu/os/linux/scale.c
+++ b/drivers/gpu/nvgpu/os/linux/scale.c
@@ -18,7 +18,6 @@
 
 #include <linux/devfreq.h>
 #include <linux/export.h>
-#include <soc/tegra/chip-id.h>
 #include <linux/pm_qos.h>
 
 #include <governor.h>
diff --git a/drivers/gpu/nvgpu/os/linux/sysfs.c b/drivers/gpu/nvgpu/os/linux/sysfs.c
index 07681dfc0..1a53a1596 100644
--- a/drivers/gpu/nvgpu/os/linux/sysfs.c
+++ b/drivers/gpu/nvgpu/os/linux/sysfs.c
@@ -890,6 +890,7 @@ static DEVICE_ATTR(tpc_pg_mask, ROOTRW, tpc_pg_mask_read, tpc_pg_mask_store);
 static ssize_t tpc_fs_mask_store(struct device *dev,
 	struct device_attribute *attr, const char *buf, size_t count)
 {
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 	struct gk20a *g = get_gk20a(dev);
 	struct nvgpu_gr_config *gr_config = nvgpu_gr_get_config_ptr(g);
 	struct nvgpu_gr_obj_ctx_golden_image *gr_golden_image =
@@ -924,6 +925,9 @@ static ssize_t tpc_fs_mask_store(struct device *dev,
 	}
 
 	return count;
+#else
+	return -ENODEV;
+#endif
 }
 
 static ssize_t tpc_fs_mask_read(struct device *dev,
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
index 5c99eb35a..f82c0a1c2 100644
--- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
@@ -22,7 +22,9 @@
 #include <linux/pm_runtime.h>
 #include <linux/pm_qos.h>
 #include <linux/platform_device.h>
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 #include <soc/tegra/chip-id.h>
+#endif
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/bug.h>
@@ -357,8 +359,10 @@ int vgpu_probe(struct platform_device *pdev)
 	}
 
 	l->dev = dev;
+#ifdef CONFIG_NVGPU_TEGRA_FUSE
 	if (tegra_platform_is_vdk())
 		nvgpu_set_enabled(gk20a, NVGPU_IS_FMODEL, true);
+#endif
 
 	gk20a->is_virtual = true;
 
diff --git a/drivers/gpu/nvgpu/os/posix/fuse.c b/drivers/gpu/nvgpu/os/posix/fuse.c
index 000591a46..91fd88cc4 100644
--- a/drivers/gpu/nvgpu/os/posix/fuse.c
+++ b/drivers/gpu/nvgpu/os/posix/fuse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2020, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,7 +27,7 @@
 #include <nvgpu/posix/soc_fuse.h>
 
 #ifdef CONFIG_NVGPU_NON_FUSA
-int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g)
+int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g, int *id)
 {
 	return 0;
 }