arm: tegra: update thermal sensor configurations
Hao Tang [Thu, 16 Feb 2012 19:45:03 +0000 (11:45 -0800)]
Bug 941960

Removed CONFIG_TEGRA_INTERNAL_TSENSOR_EDP_SUPPORT.
Add internal tsensor on kai.

Change-Id: Iaefa43112fbbaa42d43a428ecb86ad821e683f85
Signed-off-by: Hao Tang <htang@nvidia.com>
Reviewed-on: http://git-master/r/84350
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

Rebase-Id: R3253cda29f94927c189837ee6d405b73e949c66b

arch/arm/mach-tegra/board-cardhu-power.c
arch/arm/mach-tegra/board-cardhu-sensors.c
arch/arm/mach-tegra/board-cardhu.c
arch/arm/mach-tegra/board-cardhu.h

index b3d9e22..01a98a5 100644 (file)
@@ -1192,11 +1192,6 @@ static struct tegra_tsensor_pmu_data  tpdata = {
        .pmu_i2c_addr = 0x2D,
 };
 
-void __init cardhu_tsensor_init(void)
-{
-       tegra3_tsensor_init(&tpdata);
-}
-
 #ifdef CONFIG_TEGRA_EDP_LIMITS
 
 int __init cardhu_edp_init(void)
index 6c7b476..6ddabf5 100644 (file)
@@ -567,7 +567,6 @@ static struct i2c_board_info cardhu_i2c8_board_info[] = {
        },
 };
 
-#ifndef CONFIG_TEGRA_INTERNAL_TSENSOR_EDP_SUPPORT
 static int nct_get_temp(void *_data, long *temp)
 {
        struct nct1008_data *data = _data;
@@ -626,16 +625,13 @@ static void nct1008_probe_callback(struct nct1008_data *data)
 
        tegra_thermal_set_device(thermal_device);
 }
-#endif
 
 static struct nct1008_platform_data cardhu_nct1008_pdata = {
        .supported_hwrev = true,
        .ext_range = true,
        .conv_rate = 0x08,
        .offset = 8, /* 4 * 2C. Bug 844025 - 1C for device accuracies */
-#ifndef CONFIG_TEGRA_INTERNAL_TSENSOR_EDP_SUPPORT
        .probe_callback = nct1008_probe_callback,
-#endif
 };
 
 static struct i2c_board_info cardhu_i2c4_bq27510_board_info[] = {
index ab0305b..3d4e562 100644 (file)
@@ -1118,7 +1118,6 @@ static void __init tegra_cardhu_init(void)
        cardhu_edp_init();
 #endif
        cardhu_uart_init();
-       cardhu_tsensor_init();
        platform_add_devices(cardhu_devices, ARRAY_SIZE(cardhu_devices));
        cardhu_sdhci_init();
        cardhu_regulator_init();
index 00022a4..5a51f29 100644 (file)
@@ -213,7 +213,6 @@ int cardhu_pm298_gpio_switch_regulator_init(void);
 int cardhu_pm298_regulator_init(void);
 int cardhu_pm299_gpio_switch_regulator_init(void);
 int cardhu_pm299_regulator_init(void);
-void __init cardhu_tsensor_init(void);
 
 /* Baseband GPIO addresses */
 #define BB_GPIO_BB_EN                  TEGRA_GPIO_PR5