summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqtang <qtang@nvidia.com>2014-03-27 17:48:19 +0800
committerHarry Hong <hhong@nvidia.com>2014-04-01 18:16:39 -0700
commitb1f5a4392f6e7822676bea4e6c95c980f4d5ee73 (patch)
tree5983ef0eb078e8d94af556f04af8e56b6c9b47fd
parentaadc92c94d22b501bdf548f1af15ec4fec5a6885 (diff)
kernel: fairfax tskin parameter
use tuned tskin parameter for fairfax device according to macro CONFIG_FAIRFAX_TSKIN bug 1482306 Change-Id: I2f686edc6f6377958724a329f579d0994b3ca508 Signed-off-by: qtang <qtang@nvidia.com> Reviewed-on: http://git-master/r/387644 Reviewed-by: Harry Hong <hhong@nvidia.com> Tested-by: Harry Hong <hhong@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/Kconfig6
-rw-r--r--arch/arm/mach-tegra/board-tegratab-sensors.c35
-rw-r--r--drivers/power/max17048_battery.c2
3 files changed, 43 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index df30298aa2ba..e8bb2e26911e 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -359,6 +359,12 @@ config MACH_TEGRANOTE7C
help
Support for NVIDIA TEGRANOTE7C development platform
+config FAIRFAX_TSKIN
+ bool "FAIRFAX TSKIN"
+ depends on ARCH_TEGRA_11x_SOC
+ help
+ Support for tskin parameters for device Fairfax
+
config AUDIO_EDP
bool "AUDIO EDP"
depends on ARCH_TEGRA_11x_SOC
diff --git a/arch/arm/mach-tegra/board-tegratab-sensors.c b/arch/arm/mach-tegra/board-tegratab-sensors.c
index 1193750caed2..27b76bb644ef 100644
--- a/arch/arm/mach-tegra/board-tegratab-sensors.c
+++ b/arch/arm/mach-tegra/board-tegratab-sensors.c
@@ -573,6 +573,32 @@ static struct therm_est_subdevice skin_devs[] = {
},
};
+#if defined(CONFIG_FAIRFAX_TSKIN)
+static struct therm_est_subdevice skin_devs_fairfax[] = {
+ {
+ .dev_data = "Tdiode",
+ .coeffs = {
+ 7, 0, -4, -6,
+ -5, -4, -3, -2,
+ -1, -1, 0, 0,
+ 1, 1, 1, 0,
+ 1, 0, -1, -5
+ },
+ },
+ {
+ .dev_data = "Tboard",
+ .coeffs = {
+ 116, 37, 0, -14,
+ -20, -17, -17, -11,
+ -9, -3, -1, -2,
+ -4, -1, 0, -3,
+ -6, -4, 9, 49
+ },
+ },
+};
+
+#else
+
static struct therm_est_subdevice skin_devs_a02[] = {
{
.dev_data = "Tdiode",
@@ -596,6 +622,9 @@ static struct therm_est_subdevice skin_devs_a02[] = {
},
};
+
+#endif
+
static struct therm_est_subdevice skin_devs_p1988[] = {
{
.dev_data = "Tdiode",
@@ -711,10 +740,16 @@ static int __init tegratab_skin_init(void)
skin_data.ndevs = ARRAY_SIZE(skin_devs);
skin_data.devs = skin_devs;
} else {
+#if defined(CONFIG_FAIRFAX_TSKIN)
+ skin_data.toffset = 1106;
+ skin_data.ndevs = ARRAY_SIZE(skin_devs_fairfax);
+ skin_data.devs = skin_devs_fairfax;
+#else
/* Use this after P1640 A02. */
skin_data.toffset = 799;
skin_data.ndevs = ARRAY_SIZE(skin_devs_a02);
skin_data.devs = skin_devs_a02;
+#endif
}
balanced_throttle_register(&skin_throttle, "skin-balanced");
diff --git a/drivers/power/max17048_battery.c b/drivers/power/max17048_battery.c
index dca1460860f7..cea38b15a54e 100644
--- a/drivers/power/max17048_battery.c
+++ b/drivers/power/max17048_battery.c
@@ -449,6 +449,8 @@ static void max17048_work(struct work_struct *work)
chip->temperature = temp;
}
+ printk("chip->temperature = %d\n", chip->temperature);
+
if (abs(chip->temperature - chip->lasttime_temperature) >= 1500) {
dev_info(&chip->client->dev, "%s(): Temp %ldC\n",
__func__, chip->temperature / 1000);