From: Amit Daniel Kachhap <amit.daniel@samsung.com>
To: linux-pm@vger.kernel.org
Cc: Zhang Rui <rui.zhang@intel.com>,
linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
amit.kachhap@gmail.com, Kukjin Kim <kgene.kim@samsung.com>,
Eduardo Valentin <eduardo.valentin@ti.com>
Subject: [PATCH V3 06/21] thermal: exynos: Add missing definations and code cleanup
Date: Tue, 7 May 2013 18:30:56 +0530 [thread overview]
Message-ID: <1367931671-3906-7-git-send-email-amit.daniel@samsung.com> (raw)
In-Reply-To: <1367931671-3906-1-git-send-email-amit.daniel@samsung.com>
This patch adds some extra register bitfield definations and cleans
up the code to prepare for moving register macros and definations inside
the TMU data section.
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
---
drivers/thermal/samsung/exynos_tmu.c | 62 +++++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 05b5068..a43afc4 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -47,9 +47,12 @@
#define EXYNOS_TMU_TRIM_TEMP_MASK 0xff
#define EXYNOS_TMU_GAIN_SHIFT 8
+#define EXYNOS_TMU_GAIN_MASK 0xf
#define EXYNOS_TMU_REF_VOLTAGE_SHIFT 24
-#define EXYNOS_TMU_CORE_ON 3
-#define EXYNOS_TMU_CORE_OFF 2
+#define EXYNOS_TMU_REF_VOLTAGE_MASK 0x1f
+#define EXYNOS_TMU_BUF_SLOPE_SEL_MASK 0xf
+#define EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT 8
+#define EXYNOS_TMU_CORE_EN_SHIFT 0
#define EXYNOS_TMU_DEF_CODE_TO_TEMP_OFFSET 50
/* Exynos4210 specific registers */
@@ -67,6 +70,7 @@
#define EXYNOS4210_TMU_TRIG_LEVEL1_MASK 0x10
#define EXYNOS4210_TMU_TRIG_LEVEL2_MASK 0x100
#define EXYNOS4210_TMU_TRIG_LEVEL3_MASK 0x1000
+#define EXYNOS4210_TMU_TRIG_LEVEL_MASK 0x1111
#define EXYNOS4210_TMU_INTCLEAR_VAL 0x1111
/* Exynos5250 and Exynos4412 specific registers */
@@ -76,17 +80,30 @@
#define EXYNOS_EMUL_CON 0x80
#define EXYNOS_TRIMINFO_RELOAD 0x1
+#define EXYNOS_TRIMINFO_SHIFT 0x0
+#define EXYNOS_TMU_RISE_INT_MASK 0x111
+#define EXYNOS_TMU_RISE_INT_SHIFT 0
+#define EXYNOS_TMU_FALL_INT_MASK 0x111
+#define EXYNOS_TMU_FALL_INT_SHIFT 12
#define EXYNOS_TMU_CLEAR_RISE_INT 0x111
#define EXYNOS_TMU_CLEAR_FALL_INT (0x111 << 12)
-#define EXYNOS_MUX_ADDR_VALUE 6
-#define EXYNOS_MUX_ADDR_SHIFT 20
#define EXYNOS_TMU_TRIP_MODE_SHIFT 13
+#define EXYNOS_TMU_TRIP_MODE_MASK 0x7
+
+#define EXYNOS_TMU_INTEN_RISE0_SHIFT 0
+#define EXYNOS_TMU_INTEN_RISE1_SHIFT 4
+#define EXYNOS_TMU_INTEN_RISE2_SHIFT 8
+#define EXYNOS_TMU_INTEN_RISE3_SHIFT 12
+#define EXYNOS_TMU_INTEN_FALL0_SHIFT 16
+#define EXYNOS_TMU_INTEN_FALL1_SHIFT 20
+#define EXYNOS_TMU_INTEN_FALL2_SHIFT 24
#define EFUSE_MIN_VALUE 40
#define EFUSE_MAX_VALUE 100
#ifdef CONFIG_THERMAL_EMULATION
#define EXYNOS_EMUL_TIME 0x57F0
+#define EXYNOS_EMUL_TIME_MASK 0xffff
#define EXYNOS_EMUL_TIME_SHIFT 16
#define EXYNOS_EMUL_DATA_SHIFT 8
#define EXYNOS_EMUL_DATA_MASK 0xFF
@@ -265,24 +282,37 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
mutex_lock(&data->lock);
clk_enable(data->clk);
- con = pdata->reference_voltage << EXYNOS_TMU_REF_VOLTAGE_SHIFT |
- pdata->gain << EXYNOS_TMU_GAIN_SHIFT;
+ con = readl(data->base + EXYNOS_TMU_REG_CONTROL);
- if (data->soc == SOC_ARCH_EXYNOS) {
- con |= pdata->noise_cancel_mode << EXYNOS_TMU_TRIP_MODE_SHIFT;
- con |= (EXYNOS_MUX_ADDR_VALUE << EXYNOS_MUX_ADDR_SHIFT);
+ if (pdata->reference_voltage) {
+ con &= ~(EXYNOS_TMU_REF_VOLTAGE_MASK <<
+ EXYNOS_TMU_REF_VOLTAGE_SHIFT);
+ con |= pdata->reference_voltage << EXYNOS_TMU_REF_VOLTAGE_SHIFT;
+ }
+
+ if (pdata->gain) {
+ con &= ~(EXYNOS_TMU_GAIN_MASK << EXYNOS_TMU_GAIN_SHIFT);
+ con |= (pdata->gain << EXYNOS_TMU_GAIN_SHIFT);
+ }
+
+ if (pdata->noise_cancel_mode) {
+ con &= ~(EXYNOS_TMU_TRIP_MODE_MASK <<
+ EXYNOS_TMU_TRIP_MODE_SHIFT);
+ con |= (pdata->noise_cancel_mode << EXYNOS_TMU_TRIP_MODE_SHIFT);
}
if (on) {
- con |= EXYNOS_TMU_CORE_ON;
- interrupt_en = pdata->trigger_level3_en << 12 |
- pdata->trigger_level2_en << 8 |
- pdata->trigger_level1_en << 4 |
- pdata->trigger_level0_en;
+ con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT);
+ interrupt_en =
+ pdata->trigger_level3_en << EXYNOS_TMU_INTEN_RISE3_SHIFT |
+ pdata->trigger_level2_en << EXYNOS_TMU_INTEN_RISE2_SHIFT |
+ pdata->trigger_level1_en << EXYNOS_TMU_INTEN_RISE1_SHIFT |
+ pdata->trigger_level0_en << EXYNOS_TMU_INTEN_RISE0_SHIFT;
if (pdata->threshold_falling)
- interrupt_en |= interrupt_en << 16;
+ interrupt_en |=
+ interrupt_en << EXYNOS_TMU_INTEN_FALL0_SHIFT;
} else {
- con |= EXYNOS_TMU_CORE_OFF;
+ con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT);
interrupt_en = 0; /* Disable all interrupts */
}
writel(interrupt_en, data->base + EXYNOS_TMU_REG_INTEN);
--
1.7.1
next prev parent reply other threads:[~2013-05-07 13:02 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-07 13:00 [PATCH V3 0/20] thermal: exynos: Add thermal driver for exynos5440 Amit Daniel Kachhap
2013-05-07 13:00 ` [PATCH V3 01/21] thermal: exynos: Moving exynos thermal files into samsung directory Amit Daniel Kachhap
2013-05-07 13:07 ` [RESEND PATCH " Amit Daniel Kachhap
2013-05-08 15:49 ` Eduardo Valentin
2013-05-08 15:49 ` Eduardo Valentin
2013-05-09 2:15 ` amit daniel kachhap
2013-05-07 13:00 ` [PATCH V3 02/21] thermal: exynos: Bifurcate exynos thermal common and tmu controller code Amit Daniel Kachhap
2013-05-07 13:41 ` Zhang Rui
2013-05-08 3:49 ` amit daniel kachhap
2013-05-08 16:01 ` Eduardo Valentin
2013-05-08 16:01 ` Eduardo Valentin
2013-05-09 5:15 ` amit daniel kachhap
2013-05-07 13:00 ` [PATCH V3 03/21] thermal: exynos: Rename exynos_thermal.c to exynos_tmu.c Amit Daniel Kachhap
2013-05-10 15:12 ` Eduardo Valentin
2013-05-10 15:12 ` Eduardo Valentin
2013-05-07 13:00 ` [PATCH V3 04/21] thermal: exynos: Move exynos_thermal.h from include/* to driver/* folder Amit Daniel Kachhap
2013-05-09 13:28 ` Eduardo Valentin
2013-05-09 13:28 ` Eduardo Valentin
2013-05-10 1:53 ` amit daniel kachhap
2013-05-07 13:00 ` [PATCH V3 05/21] thermal: exynos: Bifurcate exynos tmu driver and configuration data Amit Daniel Kachhap
2013-05-09 13:39 ` Eduardo Valentin
2013-05-09 13:39 ` Eduardo Valentin
2013-05-10 2:05 ` amit daniel kachhap
2013-05-07 13:00 ` Amit Daniel Kachhap [this message]
2013-05-09 13:52 ` [PATCH V3 06/21] thermal: exynos: Add missing definations and code cleanup Eduardo Valentin
2013-05-09 13:52 ` Eduardo Valentin
2013-05-10 2:12 ` amit daniel kachhap
2013-05-07 13:00 ` [PATCH V3 07/21] thermal: exynos: Add extra entries in the tmu platform data Amit Daniel Kachhap
2013-05-07 13:00 ` [PATCH V3 08/21] thermal: exynos: Support thermal tripping Amit Daniel Kachhap
2013-05-07 13:00 ` [PATCH V3 09/21] thermal: exynos: Move register definitions from driver file to data file Amit Daniel Kachhap
2013-05-09 14:32 ` Eduardo Valentin
2013-05-09 14:32 ` Eduardo Valentin
2013-05-10 2:17 ` amit daniel kachhap
2013-05-10 14:14 ` Eduardo Valentin
2013-05-10 14:14 ` Eduardo Valentin
2013-05-13 1:35 ` amit daniel kachhap
2013-05-07 13:01 ` [PATCH V3 10/21] thermal: exynos: Fix to clear only the generated interrupts Amit Daniel Kachhap
2013-05-09 14:33 ` Eduardo Valentin
2013-05-09 14:33 ` Eduardo Valentin
2013-05-10 2:22 ` amit daniel kachhap
2013-05-10 15:40 ` Eduardo Valentin
2013-05-10 15:40 ` Eduardo Valentin
2013-05-13 1:36 ` amit daniel kachhap
2013-05-07 13:01 ` [PATCH V3 11/21] thermal: exynos: Add support for instance based register/unregister Amit Daniel Kachhap
2013-05-07 13:01 ` [PATCH V3 12/21] thermal: exynos: Modify private_data to appropriate name driver_data Amit Daniel Kachhap
2013-05-07 13:01 ` [PATCH V3 13/21] thermal: exynos: Return success even if no cooling data supplied Amit Daniel Kachhap
2013-05-07 13:01 ` [PATCH V3 14/21] thermal: exynos: Make the zone handling dependent on trip count Amit Daniel Kachhap
2013-05-07 13:01 ` [PATCH V3 15/21] thermal: exynos: Add support to handle many instances of TMU Amit Daniel Kachhap
2013-05-09 14:53 ` Eduardo Valentin
2013-05-09 14:53 ` Eduardo Valentin
2013-05-10 2:32 ` amit daniel kachhap
2013-05-07 13:01 ` [PATCH V3 16/21] thermal: exynos: Add features to check instead of using SOC type Amit Daniel Kachhap
2013-05-07 13:01 ` [PATCH V3 17/21] ARM: dts: thermal: exynos4: Add documentation for Exynos SoC thermal bindings Amit Daniel Kachhap
2013-05-07 13:01 ` [PATCH V3 18/21] thermal: exynos: Add support for exynos5440 TMU sensor Amit Daniel Kachhap
2013-05-09 14:47 ` Eduardo Valentin
2013-05-09 14:47 ` Eduardo Valentin
2013-05-10 2:31 ` amit daniel kachhap
2013-05-10 14:14 ` Eduardo Valentin
2013-05-10 14:14 ` Eduardo Valentin
2013-05-07 13:01 ` [PATCH V3 19/21] Documentation: thermal: Explain the exynos thermal driver model Amit Daniel Kachhap
2013-05-07 13:01 ` [PATCH V3 20/21] thermal: exynos: Support for TMU regulator defined at device tree Amit Daniel Kachhap
2013-05-09 14:44 ` Eduardo Valentin
2013-05-09 14:44 ` Eduardo Valentin
2013-05-10 2:28 ` amit daniel kachhap
2013-05-10 16:05 ` Eduardo Valentin
2013-05-10 16:05 ` Eduardo Valentin
2013-05-07 13:01 ` [PATCH V3 21/21] ARM: dts: Add device tree node for exynos5440 TMU controller Amit Daniel Kachhap
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=1367931671-3906-7-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.