From: Eduardo Valentin <eduardo.valentin@ti.com>
To: Amit Daniel Kachhap <amit.daniel@samsung.com>
Cc: <linux-pm@vger.kernel.org>, Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <eduardo.valentin@ti.com>,
<linux-samsung-soc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <amit.kachhap@gmail.com>,
Kukjin Kim <kgene.kim@samsung.com>
Subject: Re: [PATCH V7 22/30] thermal: exynos: Add driver support for exynos5440 TMU sensor
Date: Mon, 24 Jun 2013 15:43:23 -0400 [thread overview]
Message-ID: <51C8A15B.7040509@ti.com> (raw)
In-Reply-To: <1372071051-3167-23-git-send-email-amit.daniel@samsung.com>
[-- Attachment #1: Type: text/plain, Size: 8618 bytes --]
On 24-06-2013 06:50, Amit Daniel Kachhap wrote:
> This patch modifies TMU controller to add changes needed to work with
> exynos5440 platform. This sensor registers 3 instance of the tmu controller
> with the thermal zone and hence reports 3 temperature output. This controller
> supports upto five trip points. For critical threshold the driver uses the
> core driver thermal framework for shutdown.
>
> Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
> Acked-by: Kukjin Kim <kgene.kim@samsung.com>
> Signed-off-by: Jungseok Lee <jays.lee@samsung.com>
> Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
> ---
> drivers/thermal/samsung/exynos_thermal_common.h | 2 +-
> drivers/thermal/samsung/exynos_tmu.c | 55 +++++++++++++++++++---
> drivers/thermal/samsung/exynos_tmu.h | 6 +++
> drivers/thermal/samsung/exynos_tmu_data.h | 36 +++++++++++++++
> 4 files changed, 90 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h
> index bc3016e..3eb2ed9 100644
> --- a/drivers/thermal/samsung/exynos_thermal_common.h
> +++ b/drivers/thermal/samsung/exynos_thermal_common.h
> @@ -27,7 +27,7 @@
> #define SENSOR_NAME_LEN 16
> #define MAX_TRIP_COUNT 8
> #define MAX_COOLING_DEVICE 4
> -#define MAX_THRESHOLD_LEVS 4
> +#define MAX_THRESHOLD_LEVS 5
>
> #define ACTIVE_INTERVAL 500
> #define IDLE_INTERVAL 10000
> diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
> index 31bf373..6bc86f6 100644
> --- a/drivers/thermal/samsung/exynos_tmu.c
> +++ b/drivers/thermal/samsung/exynos_tmu.c
> @@ -156,7 +156,26 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
> __raw_writel(1, data->base + reg->triminfo_ctrl);
>
> /* Save trimming info in order to perform calibration */
> - trim_info = readl(data->base + reg->triminfo_data);
> + if (data->soc == SOC_ARCH_EXYNOS5440) {
> + /*
> + * For exynos5440 soc triminfo value is swapped between TMU0 and
> + * TMU2, so the below logic is needed.
> + */
> + switch (data->id) {
> + case 0:
> + trim_info = readl(data->base +
> + EXYNOS5440_EFUSE_SWAP_OFFSET + reg->triminfo_data);
> + break;
> + case 1:
> + trim_info = readl(data->base + reg->triminfo_data);
> + break;
> + case 2:
> + trim_info = readl(data->base -
> + EXYNOS5440_EFUSE_SWAP_OFFSET + reg->triminfo_data);
> + }
> + } else {
> + trim_info = readl(data->base + reg->triminfo_data);
> + }
> data->temp_error1 = trim_info & EXYNOS_TMU_TEMP_MASK;
> data->temp_error2 = ((trim_info >> reg->triminfo_85_shift) &
> EXYNOS_TMU_TEMP_MASK);
> @@ -201,7 +220,7 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
> reg->threshold_th0 + i * sizeof(reg->threshold_th0));
>
> writel(reg->inten_rise_mask, data->base + reg->tmu_intclear);
> - } else if (data->soc == SOC_ARCH_EXYNOS) {
> + } else {
> /* Write temperature code for rising and falling threshold */
> for (i = 0;
> i < trigger_levs && i < EXYNOS_MAX_TRIGGER_PER_REG; i++) {
> @@ -241,14 +260,26 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
> ret = threshold_code;
> goto out;
> }
> - rising_threshold |= threshold_code << 8 * i;
> - writel(rising_threshold,
> - data->base + reg->threshold_th0);
> + if (i == EXYNOS_MAX_TRIGGER_PER_REG - 1) {
> + /* 1-4 level to be assigned in th0 reg */
> + rising_threshold |= threshold_code << 8 * i;
> + writel(rising_threshold,
> + data->base + reg->threshold_th0);
> + } else if (i == EXYNOS_MAX_TRIGGER_PER_REG) {
> + /* 5th level to be assigned in th2 reg */
> + rising_threshold =
> + threshold_code << reg->threshold_th3_l0_shift;
> + writel(rising_threshold,
> + data->base + reg->threshold_th2);
> + }
> con = readl(data->base + reg->tmu_ctrl);
> con |= (1 << reg->therm_trip_en_shift);
> writel(con, data->base + reg->tmu_ctrl);
> }
> }
> + /*Clear the PMIN in the common TMU register*/
> + if (reg->tmu_pmin && !data->id)
> + writel(0, data->base_common + reg->tmu_pmin);
> out:
> clk_disable(data->clk);
> mutex_unlock(&data->lock);
> @@ -377,7 +408,14 @@ static void exynos_tmu_work(struct work_struct *work)
> struct exynos_tmu_data, irq_work);
> struct exynos_tmu_platform_data *pdata = data->pdata;
> const struct exynos_tmu_registers *reg = pdata->registers;
> - unsigned int val_irq;
> + unsigned int val_irq, val_type;
> +
> + /* Find which sensor generated this interrupt */
> + if (reg->tmu_irqstatus) {
> + val_type = readl(data->base_common + reg->tmu_irqstatus);
> + if (!((val_type >> data->id) & 0x1))
> + goto out;
> + }
>
> exynos_report_trigger(data->reg_conf);
> mutex_lock(&data->lock);
> @@ -390,7 +428,7 @@ static void exynos_tmu_work(struct work_struct *work)
>
> clk_disable(data->clk);
> mutex_unlock(&data->lock);
> -
> +out:
> enable_irq(data->irq);
> }
>
> @@ -538,7 +576,8 @@ static int exynos_tmu_probe(struct platform_device *pdev)
> return ret;
>
> if (pdata->type == SOC_ARCH_EXYNOS ||
> - pdata->type == SOC_ARCH_EXYNOS4210)
> + pdata->type == SOC_ARCH_EXYNOS4210 ||
> + pdata->type == SOC_ARCH_EXYNOS5440)
> data->soc = pdata->type;
> else {
> ret = -EINVAL;
> diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
> index ff8844f..25c48d4 100644
> --- a/drivers/thermal/samsung/exynos_tmu.h
> +++ b/drivers/thermal/samsung/exynos_tmu.h
> @@ -40,6 +40,7 @@ enum calibration_mode {
> enum soc_type {
> SOC_ARCH_EXYNOS4210 = 1,
> SOC_ARCH_EXYNOS,
> + SOC_ARCH_EXYNOS5440,
> };
>
> /**
> @@ -131,6 +132,8 @@ enum soc_type {
> * @emul_temp_shift: shift bits of emulation temperature.
> * @emul_time_shift: shift bits of emulation time.
> * @emul_time_mask: mask bits of emulation time.
> + * @tmu_irqstatus: register to find which TMU generated interrupts.
> + * @tmu_pmin: register to get/set the Pmin value.
> */
> struct exynos_tmu_registers {
> u32 triminfo_data;
> @@ -198,6 +201,9 @@ struct exynos_tmu_registers {
> u32 emul_temp_shift;
> u32 emul_time_shift;
> u32 emul_time_mask;
> +
> + u32 tmu_irqstatus;
> + u32 tmu_pmin;
> };
>
> /**
> diff --git a/drivers/thermal/samsung/exynos_tmu_data.h b/drivers/thermal/samsung/exynos_tmu_data.h
> index 139dbbb..ad263e9 100644
> --- a/drivers/thermal/samsung/exynos_tmu_data.h
> +++ b/drivers/thermal/samsung/exynos_tmu_data.h
> @@ -93,6 +93,42 @@
>
> #define EXYNOS_MAX_TRIGGER_PER_REG 4
>
> +/*exynos5440 specific registers*/
> +#define EXYNOS5440_TMU_S0_7_TRIM 0x000
> +#define EXYNOS5440_TMU_S0_7_CTRL 0x020
> +#define EXYNOS5440_TMU_S0_7_DEBUG 0x040
> +#define EXYNOS5440_TMU_S0_7_STATUS 0x060
> +#define EXYNOS5440_TMU_S0_7_TEMP 0x0f0
> +#define EXYNOS5440_TMU_S0_7_TH0 0x110
> +#define EXYNOS5440_TMU_S0_7_TH1 0x130
> +#define EXYNOS5440_TMU_S0_7_TH2 0x150
> +#define EXYNOS5440_TMU_S0_7_EVTEN 0x1F0
> +#define EXYNOS5440_TMU_S0_7_IRQEN 0x210
> +#define EXYNOS5440_TMU_S0_7_IRQ 0x230
> +/* exynos5440 common registers */
> +#define EXYNOS5440_TMU_IRQ_STATUS 0x000
> +#define EXYNOS5440_TMU_PMIN 0x004
> +#define EXYNOS5440_TMU_TEMP 0x008
> +
> +#define EXYNOS5440_TMU_RISE_INT_MASK 0xf
> +#define EXYNOS5440_TMU_RISE_INT_SHIFT 0
> +#define EXYNOS5440_TMU_FALL_INT_MASK 0xf
> +#define EXYNOS5440_TMU_FALL_INT_SHIFT 4
> +#define EXYNOS5440_TMU_INTEN_RISE0_SHIFT 0
> +#define EXYNOS5440_TMU_INTEN_RISE1_SHIFT 1
> +#define EXYNOS5440_TMU_INTEN_RISE2_SHIFT 2
> +#define EXYNOS5440_TMU_INTEN_RISE3_SHIFT 3
> +#define EXYNOS5440_TMU_INTEN_FALL0_SHIFT 4
> +#define EXYNOS5440_TMU_INTEN_FALL1_SHIFT 5
> +#define EXYNOS5440_TMU_INTEN_FALL2_SHIFT 6
> +#define EXYNOS5440_TMU_INTEN_FALL3_SHIFT 7
> +#define EXYNOS5440_TMU_TH_RISE0_SHIFT 0
> +#define EXYNOS5440_TMU_TH_RISE1_SHIFT 8
> +#define EXYNOS5440_TMU_TH_RISE2_SHIFT 16
> +#define EXYNOS5440_TMU_TH_RISE3_SHIFT 24
> +#define EXYNOS5440_TMU_TH_RISE4_SHIFT 24
> +#define EXYNOS5440_EFUSE_SWAP_OFFSET 8
> +
> #if defined(CONFIG_CPU_EXYNOS4210)
> extern struct exynos_tmu_init_data const exynos4210_default_tmu_data;
> #define EXYNOS4210_TMU_DRV_DATA (&exynos4210_default_tmu_data)
>
--
You have got to be excited about what you are doing. (L. Lamport)
Eduardo Valentin
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 295 bytes --]
next prev parent reply other threads:[~2013-06-24 19:43 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 [this message]
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 ` [PATCH V7 25/30] thermal: exynos: Add hardware mode thermal calibration support Amit Daniel Kachhap
2013-06-24 19:39 ` 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=51C8A15B.7040509@ti.com \
--to=eduardo.valentin@ti.com \
--cc=amit.daniel@samsung.com \
--cc=amit.kachhap@gmail.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).