summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/tegra3_speedo.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-tegra/tegra3_speedo.c')
-rw-r--r--arch/arm/mach-tegra/tegra3_speedo.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/mach-tegra/tegra3_speedo.c b/arch/arm/mach-tegra/tegra3_speedo.c
index 92ea5fe30cde..76303b4f1756 100644
--- a/arch/arm/mach-tegra/tegra3_speedo.c
+++ b/arch/arm/mach-tegra/tegra3_speedo.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/tegra3_speedo.c
*
- * Copyright (c) 2011-2012, NVIDIA Corporation. All rights reserved.
+ * Copyright (c) 2011-2013, NVIDIA Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -198,6 +198,7 @@ static void rev_sku_to_speedo_ids(int rev, int sku)
break;
case 0x81: /* T30 */
+ case 0xb1: /* T30MQS-Ax */
switch (package_id) {
case 1: /* MID => T30 */
cpu_speedo_id = 2;
@@ -303,17 +304,9 @@ static void rev_sku_to_speedo_ids(int rev, int sku)
case 0x91: /* T30AGS-Ax */
case 0xb0: /* T30IQS-Ax */
- case 0xb1: /* T30MQS-Ax */
case 0x90: /* T30AQS-Ax */
-#if defined(CONFIG_MACH_APALIS_T30) || defined(CONFIG_MACH_COLIBRI_T30)
- /* Hack: Force speedo ID of 2 for now. */
- cpu_speedo_id = 2;
- soc_speedo_id = 2;
- threshold_index = 2;
-#else /* CONFIG_MACH_APALIS_T30 | CONFIG_MACH_COLIBRI_T30 */
soc_speedo_id = 3;
threshold_index = 12;
-#endif /* CONFIG_MACH_APALIS_T30 | CONFIG_MACH_COLIBRI_T30 */
break;
case 0x93: /* T30AG-Ax */
cpu_speedo_id = 11;
@@ -480,7 +473,6 @@ void tegra_init_speedo_data(void)
if (cpu_process_id <= 2) {
switch(fuse_sku) {
case 0xb0:
- case 0xb1:
cpu_speedo_id = 9;
break;
case 0x90:
@@ -492,7 +484,6 @@ void tegra_init_speedo_data(void)
} else if (cpu_process_id >= 3 && cpu_process_id < 6) {
switch(fuse_sku) {
case 0xb0:
- case 0xb1:
cpu_speedo_id = 10;
break;
case 0x90: