On Mon, May 05, 2014 at 01:15:31PM +0200, Bartlomiej Zolnierkiewicz wrote: > There should be no functional changes caused by this patch. This patch can be merged to patch 01. > > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> > --- > drivers/thermal/samsung/exynos_tmu_data.h | 27 +-------------------------- > 1 file changed, 1 insertion(+), 26 deletions(-) > > diff --git a/drivers/thermal/samsung/exynos_tmu_data.h b/drivers/thermal/samsung/exynos_tmu_data.h > index 06c4345..d4eeddb 100644 > --- a/drivers/thermal/samsung/exynos_tmu_data.h > +++ b/drivers/thermal/samsung/exynos_tmu_data.h > @@ -42,20 +42,8 @@ > /* Exynos4210 specific registers */ > #define EXYNOS4210_TMU_REG_THRESHOLD_TEMP 0x44 > #define EXYNOS4210_TMU_REG_TRIG_LEVEL0 0x50 > -#define EXYNOS4210_TMU_REG_TRIG_LEVEL1 0x54 > -#define EXYNOS4210_TMU_REG_TRIG_LEVEL2 0x58 > -#define EXYNOS4210_TMU_REG_TRIG_LEVEL3 0x5C > -#define EXYNOS4210_TMU_REG_PAST_TEMP0 0x60 > -#define EXYNOS4210_TMU_REG_PAST_TEMP1 0x64 > -#define EXYNOS4210_TMU_REG_PAST_TEMP2 0x68 > -#define EXYNOS4210_TMU_REG_PAST_TEMP3 0x6C > - > -#define EXYNOS4210_TMU_TRIG_LEVEL0_MASK 0x1 > -#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 */ > #define EXYNOS_TMU_TRIMINFO_CON 0x14 > @@ -69,8 +57,6 @@ > #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_TMU_TRIP_MODE_SHIFT 13 > #define EXYNOS_TMU_TRIP_MODE_MASK 0x7 > #define EXYNOS_TMU_THERM_TRIP_EN_SHIFT 12 > @@ -82,8 +68,6 @@ > #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 EXYNOS_EMUL_TIME 0x57F0 > #define EXYNOS_EMUL_TIME_MASK 0xffff > @@ -107,13 +91,11 @@ > #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 > @@ -124,13 +106,6 @@ > #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 > > -- > 1.8.2.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pm" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html