diff options
author | Naveen Krishna Chatradhi <ch.naveen@samsung.com> | 2013-12-19 01:05:39 -0500 |
---|---|---|
committer | Eduardo Valentin <edubezval@gmail.com> | 2014-05-06 14:51:32 -0400 |
commit | 74429c2f034dbd07c00e20744b38a813dfe2e895 (patch) | |
tree | 19da54102f1901f874a94430bde6f56b31c685e7 /drivers/thermal/samsung/exynos_tmu.h | |
parent | 4de458174a72b93e0269e3208ff6804588481b70 (diff) |
thermal: samsung: replace inten_ bit fields with intclr_
This patch replaces the inten_rise_shift/mask and inten_fall_shift/mask
with intclr_rise_shift/mask and intclr_fall_shift/mask respectively.
Currently, inten_rise_shift/mask and inten_fall_shift/mask bits are only used
to configure intclr related registers.
Description of H/W:
The offset for the bits in the CLEAR register are not consistent across TMU
modules in Exynso5250, 5420 and 5440.
On Exynos5250, the FALL interrupt related en, status and clear bits are
available at an offset of
16 in INTEN, INTSTAT registers and at an offset of
12 in INTCLEAR register.
On Exynos5420, the FALL interrupt related en, status and clear bits are
available at an offset of
16 in INTEN, INTSTAT and INTCLEAR registers.
On Exynos5440,
the FALL_IRQEN bits are at an offset of 4
and the RISE_IRQEN bits are at an offset of 0
Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Diffstat (limited to 'drivers/thermal/samsung/exynos_tmu.h')
-rw-r--r-- | drivers/thermal/samsung/exynos_tmu.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h index 3fb65547e64c..980859a6ad1c 100644 --- a/drivers/thermal/samsung/exynos_tmu.h +++ b/drivers/thermal/samsung/exynos_tmu.h | |||
@@ -122,10 +122,6 @@ enum soc_type { | |||
122 | * @threshold_th3_l0_shift: shift bits of level0 threshold temperature. | 122 | * @threshold_th3_l0_shift: shift bits of level0 threshold temperature. |
123 | * @tmu_inten: register containing the different threshold interrupt | 123 | * @tmu_inten: register containing the different threshold interrupt |
124 | enable bits. | 124 | enable bits. |
125 | * @inten_rise_shift: shift bits of all rising interrupt bits. | ||
126 | * @inten_rise_mask: mask bits of all rising interrupt bits. | ||
127 | * @inten_fall_shift: shift bits of all rising interrupt bits. | ||
128 | * @inten_fall_mask: mask bits of all rising interrupt bits. | ||
129 | * @inten_rise0_shift: shift bits of rising 0 interrupt bits. | 125 | * @inten_rise0_shift: shift bits of rising 0 interrupt bits. |
130 | * @inten_rise1_shift: shift bits of rising 1 interrupt bits. | 126 | * @inten_rise1_shift: shift bits of rising 1 interrupt bits. |
131 | * @inten_rise2_shift: shift bits of rising 2 interrupt bits. | 127 | * @inten_rise2_shift: shift bits of rising 2 interrupt bits. |
@@ -136,6 +132,10 @@ enum soc_type { | |||
136 | * @inten_fall3_shift: shift bits of falling 3 interrupt bits. | 132 | * @inten_fall3_shift: shift bits of falling 3 interrupt bits. |
137 | * @tmu_intstat: Register containing the interrupt status values. | 133 | * @tmu_intstat: Register containing the interrupt status values. |
138 | * @tmu_intclear: Register for clearing the raised interrupt status. | 134 | * @tmu_intclear: Register for clearing the raised interrupt status. |
135 | * @intclr_fall_shift: shift bits for interrupt clear fall 0 | ||
136 | * @intclr_rise_shift: shift bits of all rising interrupt bits. | ||
137 | * @intclr_rise_mask: mask bits of all rising interrupt bits. | ||
138 | * @intclr_fall_mask: mask bits of all rising interrupt bits. | ||
139 | * @emul_con: TMU emulation controller register. | 139 | * @emul_con: TMU emulation controller register. |
140 | * @emul_temp_shift: shift bits of emulation temperature. | 140 | * @emul_temp_shift: shift bits of emulation temperature. |
141 | * @emul_time_shift: shift bits of emulation time. | 141 | * @emul_time_shift: shift bits of emulation time. |
@@ -191,10 +191,6 @@ struct exynos_tmu_registers { | |||
191 | u32 threshold_th3_l0_shift; | 191 | u32 threshold_th3_l0_shift; |
192 | 192 | ||
193 | u32 tmu_inten; | 193 | u32 tmu_inten; |
194 | u32 inten_rise_shift; | ||
195 | u32 inten_rise_mask; | ||
196 | u32 inten_fall_shift; | ||
197 | u32 inten_fall_mask; | ||
198 | u32 inten_rise0_shift; | 194 | u32 inten_rise0_shift; |
199 | u32 inten_rise1_shift; | 195 | u32 inten_rise1_shift; |
200 | u32 inten_rise2_shift; | 196 | u32 inten_rise2_shift; |
@@ -207,6 +203,10 @@ struct exynos_tmu_registers { | |||
207 | u32 tmu_intstat; | 203 | u32 tmu_intstat; |
208 | 204 | ||
209 | u32 tmu_intclear; | 205 | u32 tmu_intclear; |
206 | u32 intclr_fall_shift; | ||
207 | u32 intclr_rise_shift; | ||
208 | u32 intclr_fall_mask; | ||
209 | u32 intclr_rise_mask; | ||
210 | 210 | ||
211 | u32 emul_con; | 211 | u32 emul_con; |
212 | u32 emul_temp_shift; | 212 | u32 emul_temp_shift; |