Skip to contentSkip to conversation

therma: exynos: Supports thermal tripping

PATCH In review Jonghwan Choi 2 participants 2 messages Nov 26, 2012 – Nov 28, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v4 2/2 therma: exynos: Supports thermal tripping

TMU urgently sends active-high signal (thermal trip) to PMU, and thermal tripping by hardware logic i.e PMU is performed. Thermal tripping means that PMU cut off the whole power of SoC by controlling external voltage regulator.

---
 drivers/thermal/exynos_thermal.c |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)
(quoted diff) +0 -0

b/drivers/thermal/exynos_thermal.c
index 129e827..f0ce099 100644

drivers/thermal/exynos_thermal.c +0 -0
@@ -631,6 +631,12 @@ static int exynos_tmu_initialize(struct platform_device

*pdev)

                        goto out;
                }
                rising_threshold |= (threshold_code << 16);

+ threshold_code = temp_to_code(data,
pdata->trigger_levels[3]);
+ if (threshold_code < 0) {
+ ret = threshold_code;
+ goto out;
+ }
+ rising_threshold |= (threshold_code << 24);

                writel(rising_threshold,
                                data->base + EXYNOS_THD_TEMP_RISE);

@@ -669,10 +675,14 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)

        if (on) {
                con |= EXYNOS_TMU_CORE_ON;
-               interrupt_en = pdata->trigger_level3_en << 12 |
-                       pdata->trigger_level2_en << 8 |
+               interrupt_en = pdata->trigger_level2_en << 8 |
                        pdata->trigger_level1_en << 4 |
                        pdata->trigger_level0_en;

+
+ if (data->soc == SOC_ARCH_EXYNOS4210)
+ interrupt_en |= pdata->trigger_level3_en << 12;
+ else

+                       con |= pdata->trigger_level3_en << 12;
        } else {
                interrupt_en = 0; /* Disable all interrupts */
        }
@@ -770,6 +780,7 @@ static struct exynos_tmu_platform_data const
exynos_default_tmu_data = {
        .trigger_levels[0] = 85,
        .trigger_levels[1] = 103,
        .trigger_levels[2] = 110,
+       .trigger_levels[3] = 120,
        .trigger_level0_en = 1,
        .trigger_level1_en = 1,
        .trigger_level2_en = 1,
@@ -917,8 +928,10 @@ static int __devinit exynos_tmu_probe(struct
platform_device *pdev)
        /* Register the sensor with thermal management interface */
        (&exynos_sensor_conf)->private_data = data;
        exynos_sensor_conf.trip_data.trip_count = pdata->trigger_level0_en +

- pdata->trigger_level1_en + pdata->trigger_level2_en
+
- pdata->trigger_level3_en;
+ pdata->trigger_level1_en + pdata->trigger_level2_en;
+
+ if (data->soc == SOC_ARCH_EXYNOS4210)
+ exynos_sensor_conf.trip_data.trip_count +=
pdata->trigger_level3_en;

for (i = 0; i < exynos_sensor_conf.trip_data.trip_count; i++)
exynos_sensor_conf.trip_data.trip_val[i] =
--
1.7.4.1

#1 lore raw
Quoted 60 lines · Jonghwan Choi

TMU urgently sends active-high signal (thermal trip) to PMU, and thermal tripping by hardware logic i.e PMU is performed. Thermal tripping means that PMU cut off the whole power of SoC by controlling external voltage regulator.

---
 drivers/thermal/exynos_thermal.c |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)
drivers/thermal/exynos_thermal.c +6 -0
index 129e827..f0ce099 100644
@@ -631,6 +631,12 @@ static int exynos_tmu_initialize(struct platform_device
 *pdev)
                        goto out;
                }
                rising_threshold |= (threshold_code << 16);
+               threshold_code = temp_to_code(data,
 pdata->trigger_levels[3]);
+               if (threshold_code < 0) {
+                       ret = threshold_code;
+                       goto out;
+               }
+               rising_threshold |= (threshold_code << 24);
 
                writel(rising_threshold,
                                data->base + EXYNOS_THD_TEMP_RISE);
drivers/thermal/exynos_thermal.c +6 -2
@@ -669,10 +675,14 @@ static void exynos_tmu_control(struct platform_device
 *pdev, bool on)
 
        if (on) {
                con |= EXYNOS_TMU_CORE_ON;
-               interrupt_en = pdata->trigger_level3_en << 12 |
-                       pdata->trigger_level2_en << 8 |
+               interrupt_en = pdata->trigger_level2_en << 8 |
                        pdata->trigger_level1_en << 4 |
                        pdata->trigger_level0_en;
+
+               if (data->soc == SOC_ARCH_EXYNOS4210)
+                       interrupt_en |= pdata->trigger_level3_en << 12;
+               else
+                       con |= pdata->trigger_level3_en << 12;
        } else {
                interrupt_en = 0; /* Disable all interrupts */
        }
drivers/thermal/exynos_thermal.c +1 -0
@@ -770,6 +780,7 @@ static struct exynos_tmu_platform_data const
 exynos_default_tmu_data = {
        .trigger_levels[0] = 85,
        .trigger_levels[1] = 103,
        .trigger_levels[2] = 110,
+       .trigger_levels[3] = 120,
        .trigger_level0_en = 1,
        .trigger_level1_en = 1,
        .trigger_level2_en = 1,
drivers/thermal/exynos_thermal.c +0 -0
@@ -917,8 +928,10 @@ static int __devinit exynos_tmu_probe(struct
 platform_device *pdev)
        /* Register the sensor with thermal management interface */

drivers/thermal/exynos_thermal.c static int __devinit exynos_tmu_probe(struct · line 937

Quoted 10 lines
drivers/thermal/exynos_thermal.c +5 -2
        (&exynos_sensor_conf)->private_data = data;
        exynos_sensor_conf.trip_data.trip_count = pdata->trigger_level0_en +
-                       pdata->trigger_level1_en + pdata->trigger_level2_en
+
-                       pdata->trigger_level3_en;
+                       pdata->trigger_level1_en + pdata->trigger_level2_en;
+
+       if (data->soc == SOC_ARCH_EXYNOS4210)
+               exynos_sensor_conf.trip_data.trip_count +=
 pdata->trigger_level3_en;

Hi Choi,

Your changes looks fine but I guess we are changing a common code. I (Along with [email protected] ) have submitted a patchset which will simplify this and now this 4th trip point code addition for exynos4210 will be mostly platform data addition, So let Zhang Ru comment on my changes because this will cause merge conflict.

Thanks,
Amit D

Quoted 6 lines

for (i = 0; i < exynos_sensor_conf.trip_data.trip_count; i++)
exynos_sensor_conf.trip_data.trip_val[i] =
--
1.7.4.1