ARM: Tegra: Roth: Enable all 3 NCT72 therm sensors
Anshul Jain [Sat, 17 Nov 2012 08:54:48 +0000 (00:54 -0800)]
This change enables all 3 NCT72/NCT1008 thermal sensors.

Reviewed-on: http://git-master/r/164508
(cherry picked from commit ee74d4b40b55813c2f0c0dd1beb11375070ef774)
Change-Id: I22a40bdae314a8007cb0df69fd12b01032dd78b7
Signed-off-by: Anshul Jain <anshulj@nvidia.com>
Signed-off-by: Vikram Kanigiri <vkanigiri@nvidia.com>
Reviewed-on: http://git-master/r/164934
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-sensors.c
arch/arm/mach-tegra/board-roth.c

index 04bf16c..64a3eb7 100644 (file)
@@ -161,6 +161,8 @@ static struct regulator_consumer_supply palmas_ldo3_supply[] = {
 static struct regulator_consumer_supply palmas_ldo6_supply[] = {
        REGULATOR_SUPPLY("vdd_sensor_2v85", NULL),
        REGULATOR_SUPPLY("vdd", "0-004c"),
+       REGULATOR_SUPPLY("vdd", "1-004c"),
+       REGULATOR_SUPPLY("vdd", "1-004d"),
 };
 
 static struct regulator_consumer_supply palmas_ldo8_supply[] = {
index 7790f84..a73a8ed 100644 (file)
@@ -85,6 +85,15 @@ static struct nct1008_platform_data roth_nct1008_pdata = {
        }
 };
 
+static struct nct1008_platform_data roth_nct1008_lr_pdata = {
+       .supported_hwrev = true,
+       .ext_range = true,
+       .conv_rate = 0x08,
+       .offset = 0,
+       .shutdown_ext_limit = 90, /* C */
+       .shutdown_local_limit = 120, /* C */
+};
+
 static struct i2c_board_info roth_i2c4_nct1008_board_info[] = {
        {
                I2C_BOARD_INFO("nct1008", 0x4C),
@@ -93,6 +102,19 @@ static struct i2c_board_info roth_i2c4_nct1008_board_info[] = {
        }
 };
 
+static struct i2c_board_info roth_i2c4_nct1008_lr_board_info[] = {
+       {
+               I2C_BOARD_INFO("nct1008", 0x4C),
+               .platform_data = &roth_nct1008_lr_pdata,
+               .irq = -1,
+       },
+       {
+               I2C_BOARD_INFO("nct1008", 0x4D),
+               .platform_data = &roth_nct1008_lr_pdata,
+               .irq = -1,
+       }
+};
+
 #define VI_PINMUX(_pingroup, _mux, _pupd, _tri, _io, _lock, _ioreset) \
        {                                                       \
                .pingroup       = TEGRA_PINGROUP_##_pingroup,   \
@@ -198,6 +220,8 @@ static int roth_nct1008_init(void)
        i2c_register_board_info(0, roth_i2c4_nct1008_board_info,
                ARRAY_SIZE(roth_i2c4_nct1008_board_info));
 
+       i2c_register_board_info(1, roth_i2c4_nct1008_lr_board_info,
+               ARRAY_SIZE(roth_i2c4_nct1008_lr_board_info));
        return ret;
 }
 
index c78adb2..e8bf7e7 100644 (file)
@@ -504,7 +504,6 @@ static void __init tegra_roth_init(void)
        roth_touch_init();
        roth_panel_init();
        roth_kbc_init();
-       roth_pmon_init();
        roth_setup_bluesleep();
        roth_setup_bt_rfkill();
        tegra_release_bootloader_fb();