ARM: tegra12: set CPU rate to 2.2GHz for sku 0x87

[linux-3.10.git] / arch / arm / mach-tegra / board-roth-sensors.c

diff --git a/arch/arm/mach-tegra/board-roth-sensors.c b/arch/arm/mach-tegra/board-roth-sensors.c
index 3b6e7786308a6ffe768b37ad2362eb09c9f8d4ae..d3c8ca4fe67648be96f4b0d25f5f7dca11bde3d4 100644 (file)
--- a/arch/arm/mach-tegra/board-roth-sensors.c
+++ b/arch/arm/mach-tegra/board-roth-sensors.c
@@ -49,8 +49,6 @@
 #include "tegra-board-id.h"
 #include "dvfs.h"
 
-static struct board_info board_info;
-
 static struct throttle_table tj_throttle_table[] = {
        /* CPU_THROT_LOW cannot be used by other than CPU */
        /*      CPU,  C2BUS,  C3BUS,   SCLK,    EMC   */
@@ -253,9 +251,11 @@ static int roth_nct1008_init(void)
        tegra_platform_edp_init(roth_nct1008_pdata.trips,
                                &roth_nct1008_pdata.num_trips,
                                0); /* edp temperature margin */
-       tegra_add_cdev_trips(roth_nct1008_pdata.trips,
+       tegra_add_all_vmin_trips(roth_nct1008_pdata.trips,
+                               &roth_nct1008_pdata.num_trips);
+       tegra_add_cpu_vmax_trips(roth_nct1008_pdata.trips,
                                &roth_nct1008_pdata.num_trips);
-       tegra_add_tj_trips(roth_nct1008_pdata.trips,
+       tegra_add_core_edp_trips(roth_nct1008_pdata.trips,
                                &roth_nct1008_pdata.num_trips);
 
        roth_i2c4_nct1008_board_info[0].irq = gpio_to_irq(nct1008_port);
@@ -279,12 +279,6 @@ static int roth_nct1008_init(void)
        return ret;
 }
 
-static struct i2c_board_info __initdata bq20z45_pdata[] = {
-       {
-               I2C_BOARD_INFO("sbs-battery", 0x0B),
-       },
-};
-
 #ifdef CONFIG_TEGRA_SKIN_THROTTLE
 static struct thermal_trip_info skin_trips[] = {
        {
@@ -307,7 +301,7 @@ static struct thermal_trip_info skin_trips[] = {
 
 static struct therm_est_subdevice skin_devs[] = {
        {
-               .dev_data = "nct_ext",
+               .dev_data = "Tdiode",
                .coeffs = {
                        2, 1, 1, 1,
                        1, 1, 1, 1,
@@ -317,7 +311,7 @@ static struct therm_est_subdevice skin_devs[] = {
                },
        },
        {
-               .dev_data = "nct_int",
+               .dev_data = "Tboard",
                .coeffs = {
                        -11, -7, -5, -3,
                        -3, -2, -1, 0,
@@ -443,7 +437,7 @@ static struct therm_fan_est_data fan_est_data_p2454 = {
        .ndevs = 2,
        .devs = {
                        {
-                               .dev_data = "nct_ext_soc",
+                               .dev_data = "Tdiode_soc",
                                .get_temp = roth_fan_est_get_temp,
                                .coeffs = {
                                        100, 0, 0, 0,
@@ -454,7 +448,7 @@ static struct therm_fan_est_data fan_est_data_p2454 = {
                                },
                        },
                        {
-                               .dev_data = "nct_int_soc",
+                               .dev_data = "Tboard_soc",
                                .get_temp = roth_fan_est_get_temp,
                                .coeffs = {
                                        0, 0, 0, 0,