fuse: cleanup unwanted fuse related data

cleanup of unwanted fuse related data as
a part of migration of fuse driver

Bug 1380004

Change-Id: I78ff9f6b1d3a27ae0ba0369ad9692c40e9e24bfd
Signed-off-by: Shardar Shariff Md <smohammed@nvidia.com>
Reviewed-on: http://git-master/r/310037
Reviewed-by: Venu Byravarasu <vbyravarasu@nvidia.com>

36 files changed, 33 insertions, 205 deletions

diff --git a/arch/arm/mach-tegra/board-roth-memory.c b/arch/arm/mach-tegra/board-roth-memory.c
index 7acab5c29629..46cd44d44774 100644
--- a/arch/arm/mach-tegra/board-roth-memory.c
+++ b/arch/arm/mach-tegra/board-roth-memory.c
@@ -24,7 +24,6 @@
 #include "board-roth.h"
 
 #include "tegra11_emc.h"
-#include "fuse.h"
 #include "devices.h"
 
 static struct tegra11_emc_table h5tc4g63afr_pba_table[] = {
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 8eef000162f0..df4ddbb23f77 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -43,6 +43,7 @@
 #include <linux/bootmem.h>
 #include <linux/tegra-soc.h>
 #include <linux/dma-contiguous.h>
+#include <linux/tegra-fuse.h>
 
 #ifdef CONFIG_ARM64
 #include <linux/irqchip/gic.h>
@@ -60,7 +61,6 @@
 #include "clock.h"
 #include "common.h"
 #include "dvfs.h"
-#include "fuse.h"
 #include "iomap.h"
 #include "pm.h"
 #include "sleep.h"
diff --git a/arch/arm/mach-tegra/fuse.h b/arch/arm/mach-tegra/fuse.h
index fca5cba2dd27..8b34bda305e4 100644
--- a/arch/arm/mach-tegra/fuse.h
+++ b/arch/arm/mach-tegra/fuse.h
@@ -25,8 +25,8 @@
 #include "apbio.h"
 #include "iomap.h"
 
-#ifndef __TEGRA_FUSE_H
-#define __TEGRA_FUSE_H
+#ifndef __FUSE_H
+#define __FUSE_H
 
 #define FUSE_SKU_INFO		0x110
 #define FUSE_VP8_ENABLE_0	0x1c4
@@ -65,6 +65,7 @@
 #define FUSE_DIS_PGM		0x02C
 #define FUSE_WRITE_ACCESS	0x030
 #define FUSE_PWR_GOOD_SW	0x034
+#define FUSE_VP8_ENABLE_0	0x1c4
 
 #define FUSE_NAME_LEN	30
 
@@ -84,12 +85,6 @@
 #define START_DATA		BIT(0)
 #define SKIP_RAMREPAIR		BIT(1)
 #define FUSE_PGM_TIMEOUT_MS	50
-#define SKU_ID_T20	8
-#define SKU_ID_T25SE	20
-#define SKU_ID_AP25	23
-#define SKU_ID_T25	24
-#define SKU_ID_AP25E	27
-#define SKU_ID_T25E	28
 
 #define SBK_DEVKEY_STATUS_SZ	sizeof(u32)
 
@@ -218,106 +213,4 @@ static inline int tegra_apply_fuse(void)
 	return -ENOENT;
 }
 #endif
-
-#ifdef CONFIG_ARCH_TEGRA_2x_SOC
-static inline int tegra_fuse_get_revision(u32 *rev)
-{
-	return -ENOENT;
-}
-
-static inline int tegra_fuse_get_tsensor_calibration_data(u32 *calib)
-{
-	return -ENOENT;
-}
-static inline int tegra_fuse_get_tsensor_spare_bits(u32 *spare_bits)
-{
-	return -ENOENT;
-}
-int tegra_fuse_get_priv(char *priv);
-#else
-int tegra_fuse_get_revision(u32 *rev);
-int tegra_fuse_get_tsensor_calibration_data(u32 *calib);
-int tegra_fuse_get_tsensor_spare_bits(u32 *spare_bits);
-static inline int tegra_fuse_get_priv(char *priv)
-{
-	return -ENOENT;
-}
-#endif
-
-unsigned long long tegra_chip_uid(void);
-void tegra_init_fuse(void);
-bool tegra_spare_fuse(int bit);
-
-#ifdef CONFIG_ARCH_TEGRA_2x_SOC
-void tegra20_init_speedo_data(void);
-#else
-static inline void tegra20_init_speedo_data(void) {}
-#endif
-
-#ifdef CONFIG_ARCH_TEGRA_3x_SOC
-void tegra30_init_speedo_data(void);
-#else
-static inline void tegra30_init_speedo_data(void) {}
-#endif
-
-/*
- * read the fuse settings
- * @param: io_param_type - param type enum
- * @param: size - read size in bytes
- */
-int tegra_fuse_read(enum fuse_io_param io_param_type, u32 *data, int size);
-
-/*
- * Prior to invoking this routine, the caller is responsible for supplying
- * valid fuse programming voltage.
- *
- * @param: pgm_data - entire data to be programmed
- * @flags: program flags (e.g. FLAGS_DEVKEY)
- */
-int tegra_fuse_program(struct fuse_data *pgm_data, u32 flags);
-
-/* Disables the fuse programming until the next system reset */
-void tegra_fuse_program_disable(void);
-
-extern int (*tegra_fuse_regulator_en)(int);
-int tegra_soc_speedo_id(void);
-void tegra_init_speedo_data(void);
-int tegra_cpu_process_id(void);
-int tegra_core_process_id(void);
-int tegra_gpu_process_id(void);
-int tegra_get_age(void);
-
-#ifndef CONFIG_ARCH_TEGRA_2x_SOC
-int tegra_package_id(void);
-int tegra_cpu_speedo_id(void);
-int tegra_cpu_speedo_mv(void);
-int tegra_cpu_speedo_value(void);
-int tegra_core_speedo_mv(void);
-int tegra_gpu_speedo_id(void);
-int tegra_get_sku_override(void);
-int tegra_get_cpu_iddq_value(void);
-#else
-static inline int tegra_package_id(void) { return -1; }
-static inline int tegra_cpu_speedo_id(void) { return 0; }
-static inline int tegra_cpu_speedo_value(void) { return 1777; }
-static inline int tegra_cpu_speedo_mv(void) { return 1000; }
-static inline int tegra_core_speedo_mv(void) { return 1200; }
-static inline int tegra_get_cpu_iddq_value(void) { return 0; }
-#endif /* CONFIG_ARCH_TEGRA_2x_SOC */
-
-#ifdef CONFIG_ARCH_TEGRA_12x_SOC
-int tegra_cpu_speedo_0_value(void);
-int tegra_cpu_speedo_1_value(void);
-int tegra_soc_speedo_0_value(void);
-int tegra_soc_speedo_1_value(void);
-int tegra_soc_speedo_2_value(void);
-int tegra_get_soc_iddq_value(void);
-int tegra_get_gpu_iddq_value(void);
-int tegra_gpu_speedo_value(void);
-#endif
-
-#ifdef CONFIG_ARCH_TEGRA_14x_SOC
-int tegra_core_speedo_value(void);
-#endif
-
-#endif /* TEGRA_FUSE_H */
+#endif /* FUSE_H */
diff --git a/arch/arm/mach-tegra/include/mach/tegra_fuse.h b/arch/arm/mach-tegra/include/mach/tegra_fuse.h
deleted file mode 100644
index 4f034343e78d..000000000000
--- a/arch/arm/mach-tegra/include/mach/tegra_fuse.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/arm/mach-tegra/include/mach/tegra_fuse.h
- *
- * Tegra Public Fuse header file
- *
- * Copyright (c) 2011-2013, NVIDIA Corporation. All rights reserved.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef _MACH_TEGRA_PUBLIC_FUSE_H_
-#define _MACH_TEGRA_PUBLIC_FUSE_H_
-
-int tegra_fuse_get_revision(u32 *rev);
-int tegra_fuse_get_tsensor_calibration_data(u32 *calib);
-int tegra_fuse_get_tsensor_spare_bits(u32 *spare_bits);
-#if defined(CONFIG_ARCH_TEGRA_11x_SOC) || defined(CONFIG_ARCH_TEGRA_14x_SOC) \
-		|| defined(CONFIG_ARCH_TEGRA_12x_SOC)
-int tegra_fuse_get_tsensor_calib(int index, u32 *calib);
-int tegra_fuse_calib_base_get_cp(u32 *base_cp, s32 *shifted_cp);
-int tegra_fuse_calib_base_get_ft(u32 *base_ft, s32 *shifted_ft);
-#endif
-
-#endif /* _MACH_TEGRA_PUBLIC_FUSE_H_*/
-
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index 6e478fdc5792..a20283d5d08d 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -24,12 +24,12 @@
 #include <linux/cpumask.h>
 #include <linux/tegra-powergate.h>
 #include <linux/tegra-timer.h>
+#include <linux/tegra-fuse.h>
 
 #include <asm/cputype.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 
-#include "fuse.h"
 #include "flowctrl.h"
 #include "reset.h"
 #include "pm.h"
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index 21978406812c..859ffc3f88d5 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -75,7 +75,6 @@
 #include "board.h"
 #include "clock.h"
 #include "common.h"
-#include "fuse.h"
 #include "iomap.h"
 #include "pm.h"
 #include "reset.h"
diff --git a/arch/arm/mach-tegra/powerdetect.c b/arch/arm/mach-tegra/powerdetect.c
index eb108b0c0990..1b414ca566d1 100644
--- a/arch/arm/mach-tegra/powerdetect.c
+++ b/arch/arm/mach-tegra/powerdetect.c
@@ -26,9 +26,9 @@
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
 #include <linux/tegra-soc.h>
+#include <linux/tegra-fuse.h>
 
 #include "board.h"
-#include "fuse.h"
 #include "iomap.h"
 
 #define PMC_PWR_IO_DISABLE	0x44
diff --git a/arch/arm/mach-tegra/powergate-priv.h b/arch/arm/mach-tegra/powergate-priv.h
index 41e94b349bd5..946026ef56ba 100644
--- a/arch/arm/mach-tegra/powergate-priv.h
+++ b/arch/arm/mach-tegra/powergate-priv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2012-2013, NVIDIA CORPORATION.  All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -25,7 +25,6 @@
 #include <linux/tegra-powergate.h>
 
 #include "clock.h"
-#include "fuse.h"
 #include "iomap.h"
 
 #define MAX_CLK_EN_NUM			9
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c
index a8fc89490808..3444f361ae90 100644
--- a/arch/arm/mach-tegra/powergate.c
+++ b/arch/arm/mach-tegra/powergate.c
@@ -37,9 +37,9 @@
 #include <asm/atomic.h>
 
 #include "clock.h"
-#include "fuse.h"
 #include "iomap.h"
 #include "powergate-priv.h"
+#include "common.h"
 
 static struct powergate_ops *pg_ops;
 
diff --git a/arch/arm/mach-tegra/reset.c b/arch/arm/mach-tegra/reset.c
index a4df14b71a28..e6be374fe60a 100644
--- a/arch/arm/mach-tegra/reset.c
+++ b/arch/arm/mach-tegra/reset.c
@@ -19,6 +19,7 @@
 #include <linux/cpumask.h>
 #include <linux/bitops.h>
 #include <linux/tegra-soc.h>
+#include <linux/tegra-fuse.h>
 
 #include <asm/cacheflush.h>
 
@@ -27,7 +28,7 @@
 #include "reset.h"
 #include "sleep.h"
 #include "pm.h"
-#include "fuse.h"
+#include "common.h"
 
 #define TEGRA_IRAM_RESET_BASE (TEGRA_IRAM_BASE + \
 				TEGRA_IRAM_RESET_HANDLER_OFFSET)
diff --git a/arch/arm/mach-tegra/tegra11_clocks.c b/arch/arm/mach-tegra/tegra11_clocks.c
index 2537332ed80e..6a128824c3f5 100644
--- a/arch/arm/mach-tegra/tegra11_clocks.c
+++ b/arch/arm/mach-tegra/tegra11_clocks.c
@@ -39,7 +39,6 @@
 #include <mach/mc.h>
 
 #include "clock.h"
-#include "fuse.h"
 #include "iomap.h"
 #include "dvfs.h"
 #include "pm.h"
diff --git a/arch/arm/mach-tegra/tegra11_dvfs.c b/arch/arm/mach-tegra/tegra11_dvfs.c
index 3ac09fb8f877..3d288aadc1c9 100644
--- a/arch/arm/mach-tegra/tegra11_dvfs.c
+++ b/arch/arm/mach-tegra/tegra11_dvfs.c
@@ -21,13 +21,14 @@
 #include <linux/clk.h>
 #include <linux/kobject.h>
 #include <linux/err.h>
+#include <linux/tegra-fuse.h>
 
 #include "clock.h"
 #include "dvfs.h"
-#include "fuse.h"
 #include "board.h"
 #include "tegra_cl_dvfs.h"
 #include "tegra_core_sysfs_limits.h"
+#include "common.h"
 
 static bool tegra_dvfs_cpu_disabled;
 static bool tegra_dvfs_core_disabled;
diff --git a/arch/arm/mach-tegra/tegra11_edp.c b/arch/arm/mach-tegra/tegra11_edp.c
index f11e28451795..281b05b6a3a9 100644
--- a/arch/arm/mach-tegra/tegra11_edp.c
+++ b/arch/arm/mach-tegra/tegra11_edp.c
@@ -23,11 +23,12 @@
 #include <linux/clk.h>
 #include <linux/kobject.h>
 #include <linux/err.h>
+#include <linux/tegra-fuse.h>
 
 #include <mach/edp.h>
 
 #include "clock.h"
-#include "fuse.h"
+#include "common.h"
 
 #define CORE_MODULES_STATES 1
 #define TEMPERATURE_RANGES 4
diff --git a/arch/arm/mach-tegra/tegra11_emc.c b/arch/arm/mach-tegra/tegra11_emc.c
index c96c8d84342a..3a7e5dcf605f 100644
--- a/arch/arm/mach-tegra/tegra11_emc.c
+++ b/arch/arm/mach-tegra/tegra11_emc.c
@@ -39,7 +39,6 @@
 #include "board.h"
 #include "iomap.h"
 #include "tegra11_emc.h"
-#include "fuse.h"
 #include "tegra_emc_dt_parse.h"
 
 #ifdef CONFIG_TEGRA_EMC_SCALING_ENABLE
diff --git a/arch/arm/mach-tegra/tegra11_soctherm.c b/arch/arm/mach-tegra/tegra11_soctherm.c
index a2b734816a7f..81e911e29f60 100644
--- a/arch/arm/mach-tegra/tegra11_soctherm.c
+++ b/arch/arm/mach-tegra/tegra11_soctherm.c
@@ -42,7 +42,6 @@
 
 #include "iomap.h"
 #include "tegra3_tsensor.h"
-#include "fuse.h"
 #include "tegra11_soctherm.h"
 #include "gpio-names.h"
 #include "common.h"
diff --git a/arch/arm/mach-tegra/tegra11_speedo.c b/arch/arm/mach-tegra/tegra11_speedo.c
index 6d51d2de3145..2d6e917ee157 100644
--- a/arch/arm/mach-tegra/tegra11_speedo.c
+++ b/arch/arm/mach-tegra/tegra11_speedo.c
@@ -23,13 +23,13 @@
 #include <linux/err.h>
 #include <linux/bug.h>			/* For BUG_ON.  */
 
-#include <mach/tegra_fuse.h>
 #include <linux/tegra-soc.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/tegra-fuse.h>
 
-#include "fuse.h"
 #include "iomap.h"
+#include "common.h"
 
 #define CORE_PROCESS_CORNERS_NUM	2
 #define CPU_PROCESS_CORNERS_NUM		2
diff --git a/arch/arm/mach-tegra/tegra11x_fuse_offsets.h b/arch/arm/mach-tegra/tegra11x_fuse_offsets.h
index 1e17c29d371e..84b8a80bee9b 100644
--- a/arch/arm/mach-tegra/tegra11x_fuse_offsets.h
+++ b/arch/arm/mach-tegra/tegra11x_fuse_offsets.h
@@ -17,12 +17,7 @@
  */
 
 #include <linux/tegra-soc.h>
-
-#include <mach/tegra_fuse.h>
-
-#include "apbio.h"
-#include "fuse.h"
-#include "iomap.h"
+#include <linux/tegra-fuse.h>
 
 #ifndef __TEGRA11x_FUSE_OFFSETS_H
 #define __TEGRA11x_FUSE_OFFSETS_H
diff --git a/arch/arm/mach-tegra/tegra12_dvfs.c b/arch/arm/mach-tegra/tegra12_dvfs.c
index 09f19714479f..84929f2872c9 100644
--- a/arch/arm/mach-tegra/tegra12_dvfs.c
+++ b/arch/arm/mach-tegra/tegra12_dvfs.c
@@ -23,10 +23,10 @@
 #include <linux/kobject.h>
 #include <linux/err.h>
 #include <linux/pm_qos.h>
+#include <linux/tegra-fuse.h>
 
 #include "clock.h"
 #include "dvfs.h"
-#include "fuse.h"
 #include "board.h"
 #include "tegra_cl_dvfs.h"
 #include "tegra_core_sysfs_limits.h"
diff --git a/arch/arm/mach-tegra/tegra12_edp.c b/arch/arm/mach-tegra/tegra12_edp.c
index b7d39a562815..fe6d737dc07c 100644
--- a/arch/arm/mach-tegra/tegra12_edp.c
+++ b/arch/arm/mach-tegra/tegra12_edp.c
@@ -27,7 +27,7 @@
 #include <mach/edp.h>
 
 #include "clock.h"
-#include "fuse.h"
+#include "common.h"
 
 #define CORE_MODULES_STATES 1
 #define TEMPERATURE_RANGES 5
diff --git a/arch/arm/mach-tegra/tegra12_speedo.c b/arch/arm/mach-tegra/tegra12_speedo.c
index 10e47f892e60..6536580ffa7f 100644
--- a/arch/arm/mach-tegra/tegra12_speedo.c
+++ b/arch/arm/mach-tegra/tegra12_speedo.c
@@ -26,9 +26,10 @@
 #include <linux/tegra-soc.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/tegra-fuse.h>
 
-#include "fuse.h"
 #include "iomap.h"
+#include "common.h"
 
 #define TEGRA124_CPU_SPEEDO 2271 /* FIXME: Get Correct Value */
 
diff --git a/arch/arm/mach-tegra/tegra12x_fuse_offsets.h b/arch/arm/mach-tegra/tegra12x_fuse_offsets.h
index 79b90be2fc74..f1cb3f70ba17 100644
--- a/arch/arm/mach-tegra/tegra12x_fuse_offsets.h
+++ b/arch/arm/mach-tegra/tegra12x_fuse_offsets.h
@@ -18,10 +18,6 @@
 
 #include <linux/tegra-soc.h>
 
-#include "apbio.h"
-#include "fuse.h"
-#include "iomap.h"
-
 #ifndef __TEGRA12x_FUSE_OFFSETS_H
 #define __TEGRA12x_FUSE_OFFSETS_H
 
diff --git a/arch/arm/mach-tegra/tegra14_clocks.c b/arch/arm/mach-tegra/tegra14_clocks.c
index 22b851b7646c..558ed0b21d10 100644
--- a/arch/arm/mach-tegra/tegra14_clocks.c
+++ b/arch/arm/mach-tegra/tegra14_clocks.c
@@ -38,7 +38,6 @@
 #include <mach/tegra_bb.h>
 
 #include "clock.h"
-#include "fuse.h"
 #include "dvfs.h"
 #include "iomap.h"
 #include "pm.h"
diff --git a/arch/arm/mach-tegra/tegra14_dvfs.c b/arch/arm/mach-tegra/tegra14_dvfs.c
index dbd4e1c8fff8..dfe3ed448945 100644
--- a/arch/arm/mach-tegra/tegra14_dvfs.c
+++ b/arch/arm/mach-tegra/tegra14_dvfs.c
@@ -24,7 +24,6 @@
 
 #include "clock.h"
 #include "dvfs.h"
-#include "fuse.h"
 #include "board.h"
 #include "tegra_cl_dvfs.h"
 #include "tegra_core_sysfs_limits.h"
diff --git a/arch/arm/mach-tegra/tegra14_edp.c b/arch/arm/mach-tegra/tegra14_edp.c
index 189af4209985..1c64785b5771 100644
--- a/arch/arm/mach-tegra/tegra14_edp.c
+++ b/arch/arm/mach-tegra/tegra14_edp.c
@@ -27,7 +27,7 @@
 #include <mach/edp.h>
 
 #include "clock.h"
-#include "fuse.h"
+#include "common.h"
 
 #define CORE_MODULES_STATES 1
 #define TEMPERATURE_RANGES 5
diff --git a/arch/arm/mach-tegra/tegra14_speedo.c b/arch/arm/mach-tegra/tegra14_speedo.c
index 8b65310a2117..f40e19ea9008 100644
--- a/arch/arm/mach-tegra/tegra14_speedo.c
+++ b/arch/arm/mach-tegra/tegra14_speedo.c
@@ -23,13 +23,13 @@
 #include <linux/err.h>
 #include <linux/bug.h>
 
-#include <mach/tegra_fuse.h>
 #include <linux/tegra-soc.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/tegra-fuse.h>
 
-#include "fuse.h"
 #include "iomap.h"
+#include "common.h"
 
 #define CPU_PROCESS_CORNERS_NUM		2
 #define CORE_PROCESS_CORNERS_NUM	2
diff --git a/arch/arm/mach-tegra/tegra14x_fuse_offsets.h b/arch/arm/mach-tegra/tegra14x_fuse_offsets.h
index f16076afb411..568317e37d15 100644
--- a/arch/arm/mach-tegra/tegra14x_fuse_offsets.h
+++ b/arch/arm/mach-tegra/tegra14x_fuse_offsets.h
@@ -18,12 +18,6 @@
 
 #include <linux/tegra-soc.h>
 
-#include <mach/tegra_fuse.h>
-
-#include "apbio.h"
-#include "fuse.h"
-#include "iomap.h"
-
 #ifndef __TEGRA14x_FUSE_OFFSETS_H
 #define __TEGRA14x_FUSE_OFFSETS_H
 
diff --git a/arch/arm/mach-tegra/tegra20_speedo.c b/arch/arm/mach-tegra/tegra20_speedo.c
index 94a57c578b93..12e163e2ec2f 100644
--- a/arch/arm/mach-tegra/tegra20_speedo.c
+++ b/arch/arm/mach-tegra/tegra20_speedo.c
@@ -16,8 +16,7 @@
 
 #include <linux/kernel.h>
 #include <linux/bug.h>
-
-#include "fuse.h"
+#include <linux/tegra-fuse.h>
 
 #define CPU_SPEEDO_LSBIT		20
 #define CPU_SPEEDO_MSBIT		29
diff --git a/arch/arm/mach-tegra/tegra2_emc.c b/arch/arm/mach-tegra/tegra2_emc.c
index 81ebd9e3ebb8..bb4081e9392b 100644
--- a/arch/arm/mach-tegra/tegra2_emc.c
+++ b/arch/arm/mach-tegra/tegra2_emc.c
@@ -27,7 +27,7 @@
 #include <linux/platform_data/tegra_emc.h>
 
 #include "tegra2_emc.h"
-#include "fuse.h"
+#include "common.h"
 
 #define TEGRA_MRR_DIVLD        (1<<20)
 #define TEGRA_EMC_STATUS       0x02b4
diff --git a/arch/arm/mach-tegra/tegra2_fuse_offsets.h b/arch/arm/mach-tegra/tegra2_fuse_offsets.h
index 0eb40bf1bc59..4fe9dc637b2c 100644
--- a/arch/arm/mach-tegra/tegra2_fuse_offsets.h
+++ b/arch/arm/mach-tegra/tegra2_fuse_offsets.h
@@ -18,12 +18,6 @@
 
 #include <linux/tegra-soc.h>
 
-#include <mach/iomap.h>
-#include <mach/tegra_fuse.h>
-
-#include "apbio.h"
-#include "fuse.h"
-
 #ifndef __TEGRA2_FUSE_OFFSETS_H
 #define __TEGRA2_FUSE_OFFSETS_H
 
diff --git a/arch/arm/mach-tegra/tegra30_speedo.c b/arch/arm/mach-tegra/tegra30_speedo.c
index bf61cffc81f4..fa6f601a7071 100644
--- a/arch/arm/mach-tegra/tegra30_speedo.c
+++ b/arch/arm/mach-tegra/tegra30_speedo.c
@@ -18,8 +18,8 @@
 #include <linux/bug.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/tegra-fuse.h>
 
-#include "fuse.h"
 
 #define CORE_PROCESS_CORNERS_NUM	1
 #define CPU_PROCESS_CORNERS_NUM		7
diff --git a/arch/arm/mach-tegra/tegra3_emc.c b/arch/arm/mach-tegra/tegra3_emc.c
index 424a4c90aa3a..4eb5f834c7d9 100644
--- a/arch/arm/mach-tegra/tegra3_emc.c
+++ b/arch/arm/mach-tegra/tegra3_emc.c
@@ -40,7 +40,6 @@
 #include "clock.h"
 #include "dvfs.h"
 #include "tegra3_emc.h"
-#include "fuse.h"
 #include "iomap.h"
 
 #ifdef CONFIG_TEGRA_EMC_SCALING_ENABLE
diff --git a/arch/arm/mach-tegra/tegra3_fuse_offsets.h b/arch/arm/mach-tegra/tegra3_fuse_offsets.h
index 6132473db008..c495f56b94a6 100644
--- a/arch/arm/mach-tegra/tegra3_fuse_offsets.h
+++ b/arch/arm/mach-tegra/tegra3_fuse_offsets.h
@@ -18,12 +18,6 @@
 
 #include <linux/tegra-soc.h>
 
-#include <mach/tegra_fuse.h>
-
-#include "apbio.h"
-#include "fuse.h"
-#include "iomap.h"
-
 #ifndef __TEGRA3_FUSE_OFFSETS_H
 #define __TEGRA3_FUSE_OFFSETS_H
 
diff --git a/arch/arm/mach-tegra/tegra3_tsensor.c b/arch/arm/mach-tegra/tegra3_tsensor.c
index 43e176be732f..9d3ee457402f 100644
--- a/arch/arm/mach-tegra/tegra3_tsensor.c
+++ b/arch/arm/mach-tegra/tegra3_tsensor.c
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-tegra/tegra3_tsensor.c
  *
- * Copyright (C) 2011-2012 NVIDIA Corporation.
+ * Copyright (C) 2011-2013, NVIDIA Corporation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -19,9 +19,9 @@
 #include <linux/io.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
+#include <linux/tegra-fuse.h>
 
 #include <mach/tsensor.h>
-#include <mach/tegra_fuse.h>
 #include <mach/tsensor.h>
 
 #include "cpu-tegra.h"
diff --git a/arch/arm/mach-tegra/tegra_emc_dt_parse.c b/arch/arm/mach-tegra/tegra_emc_dt_parse.c
index 686d93a07d8e..cc8612332777 100644
--- a/arch/arm/mach-tegra/tegra_emc_dt_parse.c
+++ b/arch/arm/mach-tegra/tegra_emc_dt_parse.c
@@ -26,7 +26,7 @@
 
 #include <linux/platform_data/tegra_emc.h>
 
-#include "fuse.h"
+#include "common.h"
 
 #ifdef CONFIG_OF
 static struct device_node *tegra_emc_ramcode_devnode(
diff --git a/arch/arm/mach-tegra/tegra_fuse.c b/arch/arm/mach-tegra/tegra_fuse.c
index 9a6f7e175aaf..4fe93fc9228c 100644
--- a/arch/arm/mach-tegra/tegra_fuse.c
+++ b/arch/arm/mach-tegra/tegra_fuse.c
@@ -35,6 +35,7 @@
 #include <linux/ctype.h>
 #include <linux/wakelock.h>
 #include <linux/tegra-soc.h>
+#include <linux/tegra-fuse.h>
 
 #include <mach/gpufuse.h>
 
diff --git a/arch/arm/mach-tegra/xusb.c b/arch/arm/mach-tegra/xusb.c
index e419885f7a6d..8a8ed9c3ffa4 100644
--- a/arch/arm/mach-tegra/xusb.c
+++ b/arch/arm/mach-tegra/xusb.c
@@ -19,7 +19,7 @@
 #include <linux/types.h>
 #include <mach/xusb.h>
 #include "devices.h"
-#include "fuse.h"
+#include <linux/tegra-fuse.h>
 
 #ifdef CONFIG_TEGRA_XUSB_PLATFORM
 static struct tegra_xusb_platform_data tegra_xusb_plat_data = {};