* [PATCH] thermal: exynos: use correct offset for TMU_CONTROL register on Exynos5260
@ 2014-09-11 13:00 Bartlomiej Zolnierkiewicz
2014-10-20 12:41 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 4+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-09-11 13:00 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Naveen Krishna Chatradhi, Amit Daniel Kachhap, Lukasz Majewski,
Zhang Rui, Kyungmin Park, linux-samsung-soc, linux-pm,
linux-kernel
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@samsung.com>
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_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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] thermal: exynos: use correct offset for TMU_CONTROL register on Exynos5260
2014-09-11 13:00 [PATCH] thermal: exynos: use correct offset for TMU_CONTROL register on Exynos5260 Bartlomiej Zolnierkiewicz
@ 2014-10-20 12:41 ` Bartlomiej Zolnierkiewicz
2014-11-07 18:59 ` Eduardo Valentin
0 siblings, 1 reply; 4+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-10-20 12:41 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Amit Daniel Kachhap, Lukasz Majewski, Zhang Rui, Kyungmin Park,
linux-samsung-soc, linux-pm, linux-kernel
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@samsung.com>
> 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_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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] thermal: exynos: use correct offset for TMU_CONTROL register on Exynos5260
2014-10-20 12:41 ` Bartlomiej Zolnierkiewicz
@ 2014-11-07 18:59 ` Eduardo Valentin
2014-11-13 15:15 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 4+ messages in thread
From: Eduardo Valentin @ 2014-11-07 18:59 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz
Cc: Amit Daniel Kachhap, Lukasz Majewski, Zhang Rui, Kyungmin Park,
linux-samsung-soc, linux-pm, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 3064 bytes --]
Hi Bartlomiej,
On Mon, Oct 20, 2014 at 02:41:07PM +0200, Bartlomiej Zolnierkiewicz wrote:
>
> Hi,
>
> Eduardo, could you please merge this patch?
>
I queued this in my -fixes branch. It should appear also in linux-next.
Can you please refresh your patch series
https://lkml.org/lkml/2014/9/18/305
based on my tree? Looks like something may be missing, as could not get
all patches applied cleanly.
Thanks
> 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@samsung.com>
> > 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_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
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] thermal: exynos: use correct offset for TMU_CONTROL register on Exynos5260
2014-11-07 18:59 ` Eduardo Valentin
@ 2014-11-13 15:15 ` Bartlomiej Zolnierkiewicz
0 siblings, 0 replies; 4+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-11-13 15:15 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Amit Daniel Kachhap, Lukasz Majewski, Zhang Rui, Kyungmin Park,
linux-samsung-soc, linux-pm, linux-kernel
Hi,
On Friday, November 07, 2014 02:59:51 PM Eduardo Valentin wrote:
> Hi Bartlomiej,
>
> On Mon, Oct 20, 2014 at 02:41:07PM +0200, Bartlomiej Zolnierkiewicz wrote:
> >
> > Hi,
> >
> > Eduardo, could you please merge this patch?
> >
>
> I queued this in my -fixes branch. It should appear also in linux-next.
Thanks!
> Can you please refresh your patch series
> https://lkml.org/lkml/2014/9/18/305
>
> based on my tree? Looks like something may be missing, as could not get
> all patches applied cleanly.
Done:
http://www.mail-archive.com/linux-samsung-soc@vger.kernel.org/msg38717.html
Sorry for the delay.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
> Thanks
>
> > 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@samsung.com>
> > > 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_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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-11-13 15:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-11 13:00 [PATCH] thermal: exynos: use correct offset for TMU_CONTROL register on Exynos5260 Bartlomiej Zolnierkiewicz
2014-10-20 12:41 ` Bartlomiej Zolnierkiewicz
2014-11-07 18:59 ` Eduardo Valentin
2014-11-13 15:15 ` Bartlomiej Zolnierkiewicz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).