]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
thermal: exynos: Fix to clear only the generated interrupts
authorAmit Daniel Kachhap <amit.daniel@samsung.com>
Mon, 24 Jun 2013 10:50:33 +0000 (16:20 +0530)
committerEduardo Valentin <eduardo.valentin@ti.com>
Tue, 13 Aug 2013 13:52:01 +0000 (09:52 -0400)
This patch uses the TMU status register to know the generated interrupts
and only clear them in the interrupt handler.

Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
drivers/thermal/samsung/exynos_tmu.c
drivers/thermal/samsung/exynos_tmu_data.c

index 33f494ea1ed12925d6c4c49860bb93677e8f3d4c..f6f63ca6faf3db629dd848bdccb77d063373d024 100644 (file)
@@ -351,17 +351,16 @@ 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;
 
        exynos_report_trigger();
        mutex_lock(&data->lock);
        clk_enable(data->clk);
 
-       if (data->soc == SOC_ARCH_EXYNOS)
-               writel((reg->inten_rise_mask << reg->inten_rise_shift) |
-                       (reg->inten_fall_mask << reg->inten_fall_shift),
-                               data->base + reg->tmu_intclear);
-       else
-               writel(reg->inten_rise_mask, data->base + reg->tmu_intclear);
+       /* TODO: take action based on particular interrupt */
+       val_irq = readl(data->base + reg->tmu_intstat);
+       /* clear the interrupts */
+       writel(val_irq, data->base + reg->tmu_intclear);
 
        clk_disable(data->clk);
        mutex_unlock(&data->lock);
index 6cac3931088113fb2574166aad0e2771c72d05cf..217b8f522d320849f7b8bd294d170ddc7c1b10c0 100644 (file)
@@ -45,6 +45,7 @@ static const struct exynos_tmu_registers exynos4210_tmu_registers = {
        .inten_rise1_shift = EXYNOS_TMU_INTEN_RISE1_SHIFT,
        .inten_rise2_shift = EXYNOS_TMU_INTEN_RISE2_SHIFT,
        .inten_rise3_shift = EXYNOS_TMU_INTEN_RISE3_SHIFT,
+       .tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
        .tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
 };
 struct exynos_tmu_platform_data const exynos4210_default_tmu_data = {
@@ -112,6 +113,7 @@ static const struct exynos_tmu_registers exynos5250_tmu_registers = {
        .inten_rise2_shift = EXYNOS_TMU_INTEN_RISE2_SHIFT,
        .inten_rise3_shift = EXYNOS_TMU_INTEN_RISE3_SHIFT,
        .inten_fall0_shift = EXYNOS_TMU_INTEN_FALL0_SHIFT,
+       .tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
        .tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
        .emul_con = EXYNOS_EMUL_CON,
        .emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,