mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
thermal/drivers/hisi: Fix configuration register setting
commit b424315a28
upstream.
The TEMP0_CFG configuration register contains different field to set up the
temperature controller. However in the code, nothing prevents a setup to
overwrite the previous one: eg. writing the hdak value overwrites the sensor
selection, the sensor selection overwrites the hdak value.
In order to prevent such thing, use a regmap-like mechanism by reading the
value before, set the corresponding bits and write the result.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Rafael David Tinoco <rafael.tinoco@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f7105bd037
commit
aa6e035f25
1 changed files with 30 additions and 6 deletions
|
@ -30,6 +30,8 @@
|
|||
#define TEMP0_TH (0x4)
|
||||
#define TEMP0_RST_TH (0x8)
|
||||
#define TEMP0_CFG (0xC)
|
||||
#define TEMP0_CFG_SS_MSK (0xF000)
|
||||
#define TEMP0_CFG_HDAK_MSK (0x30)
|
||||
#define TEMP0_EN (0x10)
|
||||
#define TEMP0_INT_EN (0x14)
|
||||
#define TEMP0_INT_CLR (0x18)
|
||||
|
@ -132,19 +134,41 @@ static inline void hisi_thermal_enable(void __iomem *addr, int value)
|
|||
writel(value, addr + TEMP0_EN);
|
||||
}
|
||||
|
||||
static inline void hisi_thermal_sensor_select(void __iomem *addr, int sensor)
|
||||
{
|
||||
writel((sensor << 12), addr + TEMP0_CFG);
|
||||
}
|
||||
|
||||
static inline int hisi_thermal_get_temperature(void __iomem *addr)
|
||||
{
|
||||
return hisi_thermal_step_to_temp(readl(addr + TEMP0_VALUE));
|
||||
}
|
||||
|
||||
/*
|
||||
* Temperature configuration register - Sensor selection
|
||||
*
|
||||
* Bits [19:12]
|
||||
*
|
||||
* 0x0: local sensor (default)
|
||||
* 0x1: remote sensor 1 (ACPU cluster 1)
|
||||
* 0x2: remote sensor 2 (ACPU cluster 0)
|
||||
* 0x3: remote sensor 3 (G3D)
|
||||
*/
|
||||
static inline void hisi_thermal_sensor_select(void __iomem *addr, int sensor)
|
||||
{
|
||||
writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_SS_MSK) |
|
||||
(sensor << 12), addr + TEMP0_CFG);
|
||||
}
|
||||
|
||||
/*
|
||||
* Temperature configuration register - Hdak conversion polling interval
|
||||
*
|
||||
* Bits [5:4]
|
||||
*
|
||||
* 0x0 : 0.768 ms
|
||||
* 0x1 : 6.144 ms
|
||||
* 0x2 : 49.152 ms
|
||||
* 0x3 : 393.216 ms
|
||||
*/
|
||||
static inline void hisi_thermal_hdak_set(void __iomem *addr, int value)
|
||||
{
|
||||
writel(value, addr + TEMP0_CFG);
|
||||
writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_HDAK_MSK) |
|
||||
(value << 4), addr + TEMP0_CFG);
|
||||
}
|
||||
|
||||
static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data,
|
||||
|
|
Loading…
Reference in a new issue