All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
To: Eduardo Valentin <edubezval@gmail.com>
Cc: Zhang Rui <rui.zhang@intel.com>,
	Amit Daniel Kachhap <amit.daniel@samsung.com>,
	Lukasz Majewski <l.majewski@samsung.com>,
	Kyungmin Park <kyungmin.park@samsung.com>,
	linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org,
	linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com
Subject: [PATCH v2 17/33] thermal: exynos: add get_th_reg() helper
Date: Thu, 13 Nov 2014 16:01:12 +0100	[thread overview]
Message-ID: <1415890888-8881-18-git-send-email-b.zolnierkie@samsung.com> (raw)
In-Reply-To: <1415890888-8881-1-git-send-email-b.zolnierkie@samsung.com>

Factor out code for preparing threshold register value from
exynos_tmu_initialize() into get_th_reg().

This is a preparation for introducing per-SoC type tmu_initialize
method.

There should be no functional changes caused by this patch.

Cc: Amit Daniel Kachhap <amit.daniel@samsung.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/thermal/samsung/exynos_tmu.c | 37 ++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index b0c0715..6e82fdd 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -158,6 +158,25 @@ static void sanitize_temp_error(struct exynos_tmu_data *data, u32 trim_info)
 			EXYNOS_TMU_TEMP_MASK;
 }
 
+static u32 get_th_reg(struct exynos_tmu_data *data, u32 threshold, bool falling)
+{
+	struct exynos_tmu_platform_data *pdata = data->pdata;
+	int i;
+
+	for (i = 0; i < pdata->non_hw_trigger_levels; i++) {
+		u8 temp = pdata->trigger_levels[i];
+
+		if (falling)
+			temp -= pdata->threshold_falling;
+		else
+			threshold &= ~(0xff << 8 * i);
+
+		threshold |= temp_to_code(data, temp) << 8 * i;
+	}
+
+	return threshold;
+}
+
 static int exynos_tmu_initialize(struct platform_device *pdev)
 {
 	struct exynos_tmu_data *data = platform_get_drvdata(pdev);
@@ -221,8 +240,6 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
 	}
 	sanitize_temp_error(data, trim_info);
 
-	rising_threshold = readl(data->base + reg->threshold_th0);
-
 	if (data->soc == SOC_ARCH_EXYNOS4210) {
 		/* Write temperature code for threshold */
 		threshold_code = temp_to_code(data, pdata->threshold);
@@ -235,18 +252,10 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
 		exynos_tmu_clear_irqs(data);
 	} else {
 		/* Write temperature code for rising and falling threshold */
-		for (i = 0; i < pdata->non_hw_trigger_levels; i++) {
-			threshold_code = temp_to_code(data,
-						pdata->trigger_levels[i]);
-			rising_threshold &= ~(0xff << 8 * i);
-			rising_threshold |= threshold_code << 8 * i;
-			if (data->soc != SOC_ARCH_EXYNOS5440) {
-				threshold_code = temp_to_code(data,
-						pdata->trigger_levels[i] -
-						pdata->threshold_falling);
-				falling_threshold |= threshold_code << 8 * i;
-			}
-		}
+		rising_threshold = readl(data->base + reg->threshold_th0);
+		rising_threshold = get_th_reg(data, rising_threshold, false);
+		if (data->soc != SOC_ARCH_EXYNOS5440)
+			falling_threshold = get_th_reg(data, 0, true);
 
 		writel(rising_threshold,
 				data->base + reg->threshold_th0);
-- 
1.8.2.3


  parent reply	other threads:[~2014-11-13 15:04 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-13 15:00 [PATCH v2 00/33] thermal: exynos: convert the driver to use per-SoC type operations Bartlomiej Zolnierkiewicz
2014-11-13 15:00 ` [PATCH v2 01/33] thermal: exynos: remove needless triminfo_data abstraction Bartlomiej Zolnierkiewicz
2014-11-13 15:00 ` [PATCH v2 02/33] thermal: exynos: remove needless tmu_status abstraction Bartlomiej Zolnierkiewicz
2014-11-13 15:00 ` [PATCH v2 03/33] thermal: exynos: remove needless threshold_temp abstraction Bartlomiej Zolnierkiewicz
2014-11-13 15:00 ` [PATCH v2 04/33] thermal: exynos: remove needless triminfo_ctrl abstraction Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 05/33] thermal: exynos: remove needless test_mux_addr_shift abstraction Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 06/33] thermal: exynos: remove needless therm_trip_[mode,mask]_shift abstractions Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 07/33] thermal: exynos: remove needless therm_trip_en_shift abstraction Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 08/33] thermal: exynos: remove needless emul_temp_shift abstraction Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 09/33] thermal: exynos: remove needless emul_time_shift abstraction Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 10/33] thermal: exynos: replace tmu_irqstatus check by Exynos5440 one Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 11/33] thermal: exynos: replace tmu_pmin " Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 12/33] thermal: exynos: simplify HW_TRIP level setting Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 13/33] thermal: exynos: replace threshold_falling check by Exynos SoC type one Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 14/33] thermal: exynos: remove TMU_SUPPORT_READY_STATUS flag Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 15/33] thermal: exynos: remove TMU_SUPPORT_TRIM_RELOAD flag Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 16/33] thermal: exynos: add sanitize_temp_error() helper Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` Bartlomiej Zolnierkiewicz [this message]
2014-11-13 15:01 ` [PATCH v2 18/33] thermal: exynos: add ->tmu_initialize method Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 19/33] thermal: exynos: add get_con_reg() helper Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 20/33] thermal: exynos: add ->tmu_control method Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 21/33] thermal: exynos: add ->tmu_read method Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 22/33] thermal: exynos: add get_emul_con_reg() helper Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 23/33] thermal: exynos: add ->tmu_set_emulation method Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 24/33] thermal: exynos: add ->tmu_clear_irqs method Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 25/33] thermal: exynos: remove TMU_SUPPORT_FALLING_TRIP flag Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 26/33] thermal: exynos: remove TMU_SUPPORT_EMUL_TIME flag Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 27/33] thermal: exynos: remove TMU_SUPPORT_EMULATION flag Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 28/33] thermal: exynos: remove TMU_SUPPORT_ADDRESS_MULTIPLE flag Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 29/33] thermal: exynos: remove TMU_SUPPORT_MULTI_INST flag Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 30/33] thermal: exynos: remove test_mux pdata field Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 31/33] thermal: exynos: remove SoC type ifdefs Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 32/33] thermal: exynos: remove __EXYNOS5420_TMU_DATA macro Bartlomiej Zolnierkiewicz
2014-11-13 15:01 ` [PATCH v2 33/33] thermal: exynos: remove exynos_tmu_data.h include Bartlomiej Zolnierkiewicz
2014-11-15 18:47 ` [PATCH v2 00/33] thermal: exynos: convert the driver to use per-SoC type operations Eduardo Valentin
2014-11-20 11:58 ` Lukasz Majewski

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=1415890888-8881-18-git-send-email-b.zolnierkie@samsung.com \
    --to=b.zolnierkie@samsung.com \
    --cc=amit.daniel@samsung.com \
    --cc=edubezval@gmail.com \
    --cc=kyungmin.park@samsung.com \
    --cc=l.majewski@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.