Skip to contentSkip to conversation

thermal: exynos: use correct offset for TMU_CONTROL register on Exynos5260

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 4 messages Sep 11, 2014 – Nov 13, 2014

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

PATCH 1/1 thermal: exynos: use correct offset for TMU_CONTROL register on Exynos5260

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 <[email protected]>
Cc Amit Daniel Kachhap <[email protected]>
Cc Lukasz Majewski <[email protected]>
Cc Eduardo Valentin <[email protected]>
Cc Zhang Rui <[email protected]>
---
 drivers/thermal/samsung/exynos_tmu_data.c |    1 -
 drivers/thermal/samsung/exynos_tmu_data.h |    1 -
 2 files changed, 2 deletions(-)
drivers/thermal/samsung/exynos_tmu_data.c +0 -1
Index: b/drivers/thermal/samsung/exynos_tmu_data.c
===================================================================
@@ -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,
drivers/thermal/samsung/exynos_tmu_data.h +0 -1
Index: b/drivers/thermal/samsung/exynos_tmu_data.h
===================================================================
@@ -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
#1 lore raw

Hi,

Eduardo, could you please merge this patch?

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

Quoted 45 lines · Bartlomiej Zolnierkiewicz

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 <[email protected]>
Cc Amit Daniel Kachhap <[email protected]>
Cc Lukasz Majewski <[email protected]>
Cc Eduardo Valentin <[email protected]>
Cc Zhang Rui <[email protected]>
---
 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
===================================================================

drivers/thermal/samsung/exynos_tmu_data.c +0 -1
@@ -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
===================================================================

drivers/thermal/samsung/exynos_tmu_data.h +0 -1
@@ -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
#2 lore raw

Hi Bartlomiej,

Quoted 5 lines · Bartlomiej Zolnierkiewicz

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

Quoted 52 lines

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

Quoted 45 lines · Bartlomiej Zolnierkiewicz

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 <[email protected]>
Cc Amit Daniel Kachhap <[email protected]>
Cc Lukasz Majewski <[email protected]>
Cc Eduardo Valentin <[email protected]>
Cc Zhang Rui <[email protected]>
---
 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
===================================================================

drivers/thermal/samsung/exynos_tmu_data.c +0 -1
@@ -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
===================================================================

drivers/thermal/samsung/exynos_tmu_data.h +0 -1
@@ -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
#3 lore raw

Hi,

Quoted 10 lines · Eduardo Valentin

Hi Bartlomiej,

Quoted 5 lines · Bartlomiej Zolnierkiewicz

Hi,

Eduardo, could you please merge this patch?

I queued this in my -fixes branch. It should appear also in linux-next.

Thanks!

Quoted 5 lines

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/[email protected]/msg38717.html

Sorry for the delay.

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

Quoted 54 lines

Thanks

Quoted 52 lines

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

Quoted 45 lines · Bartlomiej Zolnierkiewicz

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 <[email protected]>
Cc Amit Daniel Kachhap <[email protected]>
Cc Lukasz Majewski <[email protected]>
Cc Eduardo Valentin <[email protected]>
Cc Zhang Rui <[email protected]>
---
 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
===================================================================

drivers/thermal/samsung/exynos_tmu_data.c +0 -1
@@ -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
===================================================================

drivers/thermal/samsung/exynos_tmu_data.h +0 -1
@@ -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