Re: [PATCH] thermal: exynos: use correct offset for TMU_CONTROL register on Exynos5260

[Bartlomiej Zolnierkiewicz]

Hi,

Eduardo, could you please merge this patch?

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

On Thursday, September 11, 2014 03:00:49 PM Bartlomiej Zolnierkiewicz wrote:
> In exynos5260_tmu_registers tmu_ctrl entry is erroneously
> assigned twice.  The second assignment (to EXYNOS_TMU_REG_CONTROL1
> define which represents 0x24 value) overrides the first one
> (to EXYNOS_TMU_REG_CONTROL define which represents 0x20 value)
> which results in the wrong (according to the Exynos5260 SoC
> documentation that I have) offset being used for TMU_CONTROL
> register.  Fix it by removing the wrong assignment and then
> remove no longer used EXYNOS_TMU_REG_CONTROL1 define.
> 
> Cc: Naveen Krishna Chatradhi <ch.naveen@xxxxxxxxxxx>
> Cc: Amit Daniel Kachhap <amit.daniel@xxxxxxxxxxx>
> Cc: Lukasz Majewski <l.majewski@xxxxxxxxxxx>
> Cc: Eduardo Valentin <edubezval@xxxxxxxxx>
> Cc: Zhang Rui <rui.zhang@xxxxxxxxx>
> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
> Acked-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> ---
>  drivers/thermal/samsung/exynos_tmu_data.c |    1 -
>  drivers/thermal/samsung/exynos_tmu_data.h |    1 -
>  2 files changed, 2 deletions(-)
> 
> Index: b/drivers/thermal/samsung/exynos_tmu_data.c
> ===================================================================
> --- a/drivers/thermal/samsung/exynos_tmu_data.c	2014-09-11 14:41:12.567347442 +0200
> +++ b/drivers/thermal/samsung/exynos_tmu_data.c	2014-09-11 14:43:00.211350284 +0200
> @@ -273,7 +273,6 @@ struct exynos_tmu_init_data const exynos
>  static const struct exynos_tmu_registers exynos5260_tmu_registers = {
>  	.triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
>  	.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
> -	.tmu_ctrl = EXYNOS_TMU_REG_CONTROL1,
>  	.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
>  	.therm_trip_mode_mask = EXYNOS_TMU_TRIP_MODE_MASK,
>  	.therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
> Index: b/drivers/thermal/samsung/exynos_tmu_data.h
> ===================================================================
> --- a/drivers/thermal/samsung/exynos_tmu_data.h	2014-09-11 14:41:12.243347433 +0200
> +++ b/drivers/thermal/samsung/exynos_tmu_data.h	2014-09-11 14:43:36.167351233 +0200
> @@ -83,7 +83,6 @@
>  #define EXYNOS_MAX_TRIGGER_PER_REG	4
>  
>  /* Exynos5260 specific */
> -#define EXYNOS_TMU_REG_CONTROL1			0x24
>  #define EXYNOS5260_TMU_REG_INTEN		0xC0
>  #define EXYNOS5260_TMU_REG_INTSTAT		0xC4
>  #define EXYNOS5260_TMU_REG_INTCLEAR		0xC8
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/