ARM: tegra: roth: initialize soc therm in arch init
Laxman Dewangan [Thu, 15 Nov 2012 01:14:56 +0000 (20:14 -0500)]
Initializing soc therm during arch init.
Remove non-require table.

(cherry picked from commit 42739c6c6a28372ba94cb0ce6e6389c2c23377d7)
Change-Id: I9d529e73813b6b0799aeb7392734a57562976b8d
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Vikram Kanigiri <vkanigiri@nvidia.com>
Reviewed-on: http://git-master/r/164866
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>

arch/arm/mach-tegra/board-roth-power.c
arch/arm/mach-tegra/board-roth.c
arch/arm/mach-tegra/board-roth.h

index 43c0661..aae8a2c 100644 (file)
@@ -767,27 +767,7 @@ static struct soctherm_platform_data roth_soctherm_data = {
        },
 };
 
-static struct balanced_throttle tj_throttle = {
-       .throt_tab_size = 10,
-       .throt_tab = {
-               {      0, 1000 },
-               { 640000, 1000 },
-               { 640000, 1000 },
-               { 640000, 1000 },
-               { 640000, 1000 },
-               { 640000, 1000 },
-               { 760000, 1000 },
-               { 760000, 1050 },
-               {1000000, 1050 },
-               {1000000, 1100 },
-       },
-};
-
-static int __init roth_soctherm_init(void)
+int __init roth_soctherm_init(void)
 {
-       roth_soctherm_data.therm[THERM_CPU].cdev =
-                       balanced_throttle_register(&tj_throttle);
-
        return tegra11_soctherm_init(&roth_soctherm_data);
 }
-module_init(roth_soctherm_init);
index 658f587..833920c 100644 (file)
@@ -71,7 +71,6 @@
 #include "board-common.h"
 #include "clock.h"
 #include "board-roth.h"
-#include "board-roth.h"
 #include "devices.h"
 #include "gpio-names.h"
 #include "fuse.h"
@@ -634,6 +633,7 @@ static void __init tegra_roth_init(void)
 #endif
        tegra_serial_debug_init(TEGRA_UARTD_BASE, INT_WDT_CPU, NULL, -1, -1);
        roth_sensors_init();
+       roth_soctherm_init();
 }
 
 static void __init roth_ramconsole_reserve(unsigned long size)
index 4d54096..4fe21ee 100644 (file)
@@ -100,5 +100,6 @@ int roth_emc_init(void);
 int roth_edp_init(void);
 int roth_panel_init(void);
 int roth_pmon_init(void);
+int roth_soctherm_init(void);
 
 #endif