From: Amit Daniel Kachhap <amit.daniel@samsung.com>
To: linux-pm@vger.kernel.org, Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <eduardo.valentin@ti.com>
Cc: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
amit.kachhap@gmail.com, Kukjin Kim <kgene.kim@samsung.com>
Subject: [PATCH V7 25/30] thermal: exynos: Add hardware mode thermal calibration support
Date: Mon, 24 Jun 2013 16:20:46 +0530 [thread overview]
Message-ID: <1372071051-3167-26-git-send-email-amit.daniel@samsung.com> (raw)
In-Reply-To: <1372071051-3167-1-git-send-email-amit.daniel@samsung.com>
This patch adds support for h/w mode calibration in the TMU controller.
Soc's like 5440 support this features. The h/w bits needed for calibration
setting are same as that of enum calibration_type.
Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
---
drivers/thermal/samsung/exynos_tmu.c | 15 +++++++++++++++
drivers/thermal/samsung/exynos_tmu.h | 6 ++++++
drivers/thermal/samsung/exynos_tmu_data.c | 2 ++
drivers/thermal/samsung/exynos_tmu_data.h | 2 ++
4 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 3fac0f9..34b999b 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -73,6 +73,9 @@ static int temp_to_code(struct exynos_tmu_data *data, u8 temp)
struct exynos_tmu_platform_data *pdata = data->pdata;
int temp_code;
+ if (pdata->cal_mode == HW_MODE)
+ return temp;
+
if (data->soc == SOC_ARCH_EXYNOS4210)
/* temp should range between 25 and 125 */
if (temp < 25 || temp > 125) {
@@ -107,6 +110,9 @@ static int code_to_temp(struct exynos_tmu_data *data, u8 temp_code)
struct exynos_tmu_platform_data *pdata = data->pdata;
int temp;
+ if (pdata->cal_mode == HW_MODE)
+ return temp_code;
+
if (data->soc == SOC_ARCH_EXYNOS4210)
/* temp_code should range between 75 and 175 */
if (temp_code < 75 || temp_code > 175) {
@@ -155,6 +161,9 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
if (TMU_SUPPORTS(pdata, TRIM_RELOAD))
__raw_writel(1, data->base + reg->triminfo_ctrl);
+ if (pdata->cal_mode == HW_MODE)
+ goto skip_calib_data;
+
/* Save trimming info in order to perform calibration */
if (data->soc == SOC_ARCH_EXYNOS5440) {
/*
@@ -190,6 +199,7 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
(pdata->efuse_value >> reg->triminfo_85_shift) &
EXYNOS_TMU_TEMP_MASK;
+skip_calib_data:
if (pdata->max_trigger_level > MAX_THRESHOLD_LEVS) {
dev_err(&pdev->dev, "Invalid max trigger level\n");
goto out;
@@ -320,6 +330,11 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
con |= (pdata->noise_cancel_mode << reg->therm_trip_mode_shift);
}
+ if (pdata->cal_mode == HW_MODE) {
+ con &= ~(reg->calib_mode_mask << reg->calib_mode_shift);
+ con |= pdata->cal_type << reg->calib_mode_shift;
+ }
+
if (on) {
con |= (1 << reg->core_en_shift);
interrupt_en =
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
index 25c48d4..60d863c 100644
--- a/drivers/thermal/samsung/exynos_tmu.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -90,6 +90,10 @@ enum soc_type {
* @buf_slope_sel_shift: shift bits of amplifier gain value in tmu_ctrl
register.
* @buf_slope_sel_mask: mask bits of amplifier gain value in tmu_ctrl register.
+ * @calib_mode_shift: shift bits of calibration mode value in tmu_ctrl
+ register.
+ * @calib_mode_mask: mask bits of calibration mode value in tmu_ctrl
+ register.
* @therm_trip_tq_en_shift: shift bits of thermal trip enable by TQ pin in
tmu_ctrl register.
* @core_en_shift: shift bits of TMU core enable bit in tmu_ctrl register.
@@ -151,6 +155,8 @@ struct exynos_tmu_registers {
u32 therm_trip_en_shift;
u32 buf_slope_sel_shift;
u32 buf_slope_sel_mask;
+ u32 calib_mode_shift;
+ u32 calib_mode_mask;
u32 therm_trip_tq_en_shift;
u32 core_en_shift;
diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c
index 5952915..9002499 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.c
+++ b/drivers/thermal/samsung/exynos_tmu_data.c
@@ -189,6 +189,8 @@ static const struct exynos_tmu_registers exynos5440_tmu_registers = {
.therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
.buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
.buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
+ .calib_mode_shift = EXYNOS_TMU_CALIB_MODE_SHIFT,
+ .calib_mode_mask = EXYNOS_TMU_CALIB_MODE_MASK,
.core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
.tmu_status = EXYNOS5440_TMU_S0_7_STATUS,
.tmu_cur_temp = EXYNOS5440_TMU_S0_7_TEMP,
diff --git a/drivers/thermal/samsung/exynos_tmu_data.h b/drivers/thermal/samsung/exynos_tmu_data.h
index 43ce5fb..dc7feb5 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.h
+++ b/drivers/thermal/samsung/exynos_tmu_data.h
@@ -75,6 +75,8 @@
#define EXYNOS_TMU_TRIP_MODE_SHIFT 13
#define EXYNOS_TMU_TRIP_MODE_MASK 0x7
#define EXYNOS_TMU_THERM_TRIP_EN_SHIFT 12
+#define EXYNOS_TMU_CALIB_MODE_SHIFT 4
+#define EXYNOS_TMU_CALIB_MODE_MASK 0x3
#define EXYNOS_TMU_INTEN_RISE0_SHIFT 0
#define EXYNOS_TMU_INTEN_RISE1_SHIFT 4
--
1.7.1
next prev parent reply other threads:[~2013-06-24 10:52 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-24 10:50 [PATCH V7 00/30] thermal: exynos: Re-structure driver and add support for exynos5440 Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 01/30] thermal: exynos: Moving exynos thermal files into samsung directory Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 02/30] thermal: exynos: Use ARCH_HAS_BANDGAP config to know the supported soc's Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 03/30] thermal: exynos: Remove un-necessary CPU_THERMAL dependency Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 04/30] thermal: exynos: Bifurcate exynos thermal common and tmu controller code Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 05/30] thermal: exynos: Rename exynos_thermal.c to exynos_tmu.c Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 06/30] thermal: exynos: Move exynos_thermal.h from include/* to driver/* folder Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 07/30] thermal: exynos: Bifurcate exynos tmu driver and configuration data Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 08/30] thermal: exynos: Add missing definations and code cleanup Amit Daniel Kachhap
2013-06-24 15:00 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 09/30] thermal: exynos: Add extra entries in the tmu platform data Amit Daniel Kachhap
2013-06-24 15:33 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 10/30] thermal: exynos: Move register definitions from driver to data file Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 11/30] thermal: exynos: Support thermal tripping Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 12/30] thermal: exynos: Fix to clear only the generated interrupts Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 13/30] thermal: exynos: Add support for instance based register/unregister Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 14/30] thermal: exynos: Modify private_data to appropriate name driver_data Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 15/30] thermal: exynos: Return success even if no cooling data supplied Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 16/30] thermal: exynos: Make the zone handling use trip information Amit Daniel Kachhap
2013-06-24 15:41 ` Eduardo Valentin
2013-06-25 8:33 ` amit daniel kachhap
2013-06-25 11:39 ` [PATCH RESEND " Amit Daniel Kachhap
2013-06-25 13:36 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 17/30] thermal: exynos: Remove non DT based support Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 18/30] thermal: exynos: Add support to handle many instances of TMU Amit Daniel Kachhap
2013-06-24 15:50 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 19/30] thermal: exynos: Add TMU features to check instead of using SOC type Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 20/30] thermal: exynos: use device resource management infrastructure Amit Daniel Kachhap
2013-06-25 11:41 ` [PATCH RESEND " Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 21/30] thermal: exynos: Add support to access common register for multistance Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 22/30] thermal: exynos: Add driver support for exynos5440 TMU sensor Amit Daniel Kachhap
2013-06-24 19:43 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 23/30] thermal: exynos: Add thermal configuration data " Amit Daniel Kachhap
2013-06-24 16:37 ` Eduardo Valentin
2013-06-26 1:24 ` Jungseok Lee
2013-08-07 9:53 ` Naveen Krishna Ch
2013-06-24 10:50 ` [PATCH V7 24/30] thermal: exynos: Fix to set the second point correction value Amit Daniel Kachhap
2013-06-24 10:50 ` Amit Daniel Kachhap [this message]
2013-06-24 19:39 ` [PATCH V7 25/30] thermal: exynos: Add hardware mode thermal calibration support Eduardo Valentin
2013-06-25 9:12 ` amit daniel kachhap
2013-06-25 11:46 ` [PATCH RESEND " Amit Daniel Kachhap
2013-06-25 13:38 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 26/30] thermal: exynos: Support for TMU regulator defined at device tree Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 27/30] ARM: dts: thermal: exynos: Add documentation for Exynos SoC thermal bindings Amit Daniel Kachhap
2013-06-24 17:05 ` Eduardo Valentin
2013-06-24 10:50 ` [PATCH V7 28/30] Documentation: thermal: Explain the exynos thermal driver model Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 29/30] ARM: dts: Add device tree node for exynos5440 TMU controller Amit Daniel Kachhap
2013-06-24 10:50 ` [PATCH V7 30/30] arm: exynos: enable ARCH_HAS_BANDGAP Amit Daniel Kachhap
2013-06-24 17:11 ` Eduardo Valentin
2013-06-24 17:13 ` [PATCH V7 00/30] thermal: exynos: Re-structure driver and add support for exynos5440 Kukjin Kim
2013-06-24 19:51 ` Eduardo Valentin
2013-06-25 11:53 ` amit daniel kachhap
2013-06-28 5:19 ` amit daniel kachhap
2013-06-28 5:30 ` Zhang, Rui
2013-07-08 23:13 ` Eduardo Valentin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372071051-3167-26-git-send-email-amit.daniel@samsung.com \
--to=amit.daniel@samsung.com \
--cc=amit.kachhap@gmail.com \
--cc=eduardo.valentin@ti.com \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).