redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

thermal: sy7636a: Use "vcom" regulator for power on 

Use its own regulator "vcom" for turning on the epd pmic
when checking temperature. This avoids duplicate code,
and prevents a pile of bugs.
zero-sugar
Lars Ivar Miljeteig 2020-09-22 13:27:11 +02:00
parent f6bb4d231b
commit cf22985f20
1 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/thermal/sy7636a_thermal.c
View File

@ -18,57 +18,35 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/thermal.h>
#include <linux/regulator/consumer.h>
#include <linux/mfd/sy7636a.h>
struct sy7636a_data {
struct sy7636a *sy7636a;
struct thermal_zone_device *thermal_zone_dev;
struct regulator *regulator;
};
static int sy7636a_get_temp(void *arg, int *res)
{
unsigned int reg_val, mode_ctr;
unsigned int reg_val;
int ret;
struct sy7636a_data *data = arg;
bool isVoltageActive;
mutex_lock(&data->sy7636a->reglock);
ret = regmap_read(data->sy7636a->regmap,
SY7636A_REG_OPERATION_MODE_CRL, &mode_ctr);
ret = regulator_enable(data->regulator);
if (ret)
goto done;
isVoltageActive = mode_ctr & SY7636A_OPERATION_MODE_CRL_ONOFF;
if (!isVoltageActive) {
ret = regmap_write(data->sy7636a->regmap,
SY7636A_REG_OPERATION_MODE_CRL,
mode_ctr | SY7636A_OPERATION_MODE_CRL_ONOFF);
if (ret)
goto done;
usleep_range(1000, 1500);
}
return ret;
ret = regmap_read(data->sy7636a->regmap,
SY7636A_REG_TERMISTOR_READOUT, &reg_val);
if (ret)
goto done;
if (!isVoltageActive) {
ret = regmap_write(data->sy7636a->regmap,
SY7636A_REG_OPERATION_MODE_CRL,
mode_ctr);
if (ret)
goto done;
if (!ret) {
*res = *((signed char*)&reg_val);
*res *= 1000;
}
*res = *((signed char*)&reg_val);
*res *= 1000;
done:
mutex_unlock(&data->sy7636a->reglock);
regulator_disable(data->regulator);
return ret;
}
@ -91,6 +69,14 @@ static int sy7636a_thermal_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, data);
data->regulator = devm_regulator_get(&pdev->dev, "vcom");
if (IS_ERR(data->regulator)) {
dev_err(&pdev->dev,
"Unable to get vcom regulator, returned %ld\n",
PTR_ERR(data->regulator));
return PTR_ERR(data->regulator);
}
data->sy7636a = sy7636a;
data->thermal_zone_dev = devm_thermal_zone_of_sensor_register(
pdev->dev.parent,