hwmon: (ntc_thermistor) Merge platform data
Allocate one state container for the device: struct ntc_data. Move all items from struct ntc_thermistor_platform_data into this struct and simplify. Cc: Peter Rosin <peda@axentia.se> Cc: Chris Lesiak <chris.lesiak@licor.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20211125020841.3616359-5-linus.walleij@linaro.org Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Linus Walleij
Guenter Roeck
Родитель
209218efd6
Коммит
e380095b80
|
|
@ -26,25 +26,6 @@ enum ntc_thermistor_type {
|
|||
TYPE_NCPXXXH103,
|
||||
};
|
||||
|
||||
struct ntc_thermistor_platform_data {
|
||||
/*
|
||||
* pullup_uV, pullup_ohm, pulldown_ohm, and connect are required.
|
||||
*
|
||||
* How to setup pullup_ohm, pulldown_ohm, and connect is
|
||||
* described at Documentation/hwmon/ntc_thermistor.rst
|
||||
*
|
||||
* pullup/down_ohm: 0 for infinite / not-connected
|
||||
*
|
||||
* chan: iio_channel pointer to communicate with the ADC which the
|
||||
* thermistor is using for conversion of the analog values.
|
||||
*/
|
||||
unsigned int pullup_uv;
|
||||
unsigned int pullup_ohm;
|
||||
unsigned int pulldown_ohm;
|
||||
enum { NTC_CONNECTED_POSITIVE, NTC_CONNECTED_GROUND } connect;
|
||||
struct iio_channel *chan;
|
||||
};
|
||||
|
||||
struct ntc_compensation {
|
||||
int temp_c;
|
||||
unsigned int ohm;
|
||||
|
|
@ -337,15 +318,30 @@ static const struct ntc_type ntc_type[] = {
|
|||
NTC_TYPE(TYPE_NCPXXXH103, ncpXXxh103),
|
||||
};
|
||||
|
||||
/*
|
||||
* pullup_uV, pullup_ohm, pulldown_ohm, and connect are required.
|
||||
*
|
||||
* How to setup pullup_ohm, pulldown_ohm, and connect is
|
||||
* described at Documentation/hwmon/ntc_thermistor.rst
|
||||
*
|
||||
* pullup/down_ohm: 0 for infinite / not-connected
|
||||
*
|
||||
* chan: iio_channel pointer to communicate with the ADC which the
|
||||
* thermistor is using for conversion of the analog values.
|
||||
*/
|
||||
struct ntc_data {
|
||||
struct ntc_thermistor_platform_data *pdata;
|
||||
const struct ntc_compensation *comp;
|
||||
int n_comp;
|
||||
unsigned int pullup_uv;
|
||||
unsigned int pullup_ohm;
|
||||
unsigned int pulldown_ohm;
|
||||
enum { NTC_CONNECTED_POSITIVE, NTC_CONNECTED_GROUND } connect;
|
||||
struct iio_channel *chan;
|
||||
};
|
||||
|
||||
static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
|
||||
static int ntc_adc_iio_read(struct ntc_data *data)
|
||||
{
|
||||
struct iio_channel *channel = pdata->chan;
|
||||
struct iio_channel *channel = data->chan;
|
||||
int uv, ret;
|
||||
|
||||
ret = iio_read_channel_processed_scale(channel, &uv, 1000);
|
||||
|
|
@ -365,7 +361,7 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
|
|||
ret = iio_convert_raw_to_processed(channel, raw, &uv, 1000);
|
||||
if (ret < 0) {
|
||||
/* Assume 12 bit ADC with vref at pullup_uv */
|
||||
uv = (pdata->pullup_uv * (s64)raw) >> 12;
|
||||
uv = (data->pullup_uv * (s64)raw) >> 12;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -407,20 +403,19 @@ static const struct of_device_id ntc_match[] = {
|
|||
};
|
||||
MODULE_DEVICE_TABLE(of, ntc_match);
|
||||
|
||||
static struct ntc_thermistor_platform_data *
|
||||
ntc_thermistor_parse_dt(struct device *dev)
|
||||
static struct ntc_data *ntc_thermistor_parse_dt(struct device *dev)
|
||||
{
|
||||
struct ntc_data *data;
|
||||
struct iio_channel *chan;
|
||||
enum iio_chan_type type;
|
||||
struct device_node *np = dev->of_node;
|
||||
struct ntc_thermistor_platform_data *pdata;
|
||||
int ret;
|
||||
|
||||
if (!np)
|
||||
return NULL;
|
||||
|
||||
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
|
||||
if (!pdata)
|
||||
data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
|
||||
if (!data)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
chan = devm_iio_channel_get(dev, NULL);
|
||||
|
|
@ -434,21 +429,21 @@ ntc_thermistor_parse_dt(struct device *dev)
|
|||
if (type != IIO_VOLTAGE)
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
if (of_property_read_u32(np, "pullup-uv", &pdata->pullup_uv))
|
||||
if (of_property_read_u32(np, "pullup-uv", &data->pullup_uv))
|
||||
return ERR_PTR(-ENODEV);
|
||||
if (of_property_read_u32(np, "pullup-ohm", &pdata->pullup_ohm))
|
||||
if (of_property_read_u32(np, "pullup-ohm", &data->pullup_ohm))
|
||||
return ERR_PTR(-ENODEV);
|
||||
if (of_property_read_u32(np, "pulldown-ohm", &pdata->pulldown_ohm))
|
||||
if (of_property_read_u32(np, "pulldown-ohm", &data->pulldown_ohm))
|
||||
return ERR_PTR(-ENODEV);
|
||||
|
||||
if (of_find_property(np, "connected-positive", NULL))
|
||||
pdata->connect = NTC_CONNECTED_POSITIVE;
|
||||
data->connect = NTC_CONNECTED_POSITIVE;
|
||||
else /* status change should be possible if not always on. */
|
||||
pdata->connect = NTC_CONNECTED_GROUND;
|
||||
data->connect = NTC_CONNECTED_GROUND;
|
||||
|
||||
pdata->chan = chan;
|
||||
data->chan = chan;
|
||||
|
||||
return pdata;
|
||||
return data;
|
||||
}
|
||||
|
||||
static inline u64 div64_u64_safe(u64 dividend, u64 divisor)
|
||||
|
|
@ -462,24 +457,23 @@ static inline u64 div64_u64_safe(u64 dividend, u64 divisor)
|
|||
|
||||
static int get_ohm_of_thermistor(struct ntc_data *data, unsigned int uv)
|
||||
{
|
||||
struct ntc_thermistor_platform_data *pdata = data->pdata;
|
||||
u32 puv = pdata->pullup_uv;
|
||||
u32 puv = data->pullup_uv;
|
||||
u64 n, puo, pdo;
|
||||
puo = pdata->pullup_ohm;
|
||||
pdo = pdata->pulldown_ohm;
|
||||
puo = data->pullup_ohm;
|
||||
pdo = data->pulldown_ohm;
|
||||
|
||||
if (uv == 0)
|
||||
return (pdata->connect == NTC_CONNECTED_POSITIVE) ?
|
||||
return (data->connect == NTC_CONNECTED_POSITIVE) ?
|
||||
INT_MAX : 0;
|
||||
if (uv >= puv)
|
||||
return (pdata->connect == NTC_CONNECTED_POSITIVE) ?
|
||||
return (data->connect == NTC_CONNECTED_POSITIVE) ?
|
||||
0 : INT_MAX;
|
||||
|
||||
if (pdata->connect == NTC_CONNECTED_POSITIVE && puo == 0)
|
||||
if (data->connect == NTC_CONNECTED_POSITIVE && puo == 0)
|
||||
n = div_u64(pdo * (puv - uv), uv);
|
||||
else if (pdata->connect == NTC_CONNECTED_GROUND && pdo == 0)
|
||||
else if (data->connect == NTC_CONNECTED_GROUND && pdo == 0)
|
||||
n = div_u64(puo * uv, puv - uv);
|
||||
else if (pdata->connect == NTC_CONNECTED_POSITIVE)
|
||||
else if (data->connect == NTC_CONNECTED_POSITIVE)
|
||||
n = div64_u64_safe(pdo * puo * (puv - uv),
|
||||
puo * uv - pdo * (puv - uv));
|
||||
else
|
||||
|
|
@ -579,7 +573,7 @@ static int ntc_thermistor_get_ohm(struct ntc_data *data)
|
|||
{
|
||||
int read_uv;
|
||||
|
||||
read_uv = ntc_adc_iio_read(data->pdata);
|
||||
read_uv = ntc_adc_iio_read(data);
|
||||
if (read_uv < 0)
|
||||
return read_uv;
|
||||
return get_ohm_of_thermistor(data, read_uv);
|
||||
|
|
@ -650,38 +644,31 @@ static int ntc_thermistor_probe(struct platform_device *pdev)
|
|||
const struct of_device_id *of_id =
|
||||
of_match_device(of_match_ptr(ntc_match), dev);
|
||||
const struct platform_device_id *pdev_id;
|
||||
struct ntc_thermistor_platform_data *pdata;
|
||||
struct device *hwmon_dev;
|
||||
struct ntc_data *data;
|
||||
|
||||
pdata = ntc_thermistor_parse_dt(dev);
|
||||
if (IS_ERR(pdata))
|
||||
return PTR_ERR(pdata);
|
||||
data = ntc_thermistor_parse_dt(dev);
|
||||
if (IS_ERR(data))
|
||||
return PTR_ERR(data);
|
||||
|
||||
if (!pdata) {
|
||||
if (!data) {
|
||||
dev_err(dev, "No platform init data supplied.\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (pdata->pullup_uv == 0 ||
|
||||
(pdata->pullup_ohm == 0 && pdata->connect ==
|
||||
if (data->pullup_uv == 0 ||
|
||||
(data->pullup_ohm == 0 && data->connect ==
|
||||
NTC_CONNECTED_GROUND) ||
|
||||
(pdata->pulldown_ohm == 0 && pdata->connect ==
|
||||
(data->pulldown_ohm == 0 && data->connect ==
|
||||
NTC_CONNECTED_POSITIVE) ||
|
||||
(pdata->connect != NTC_CONNECTED_POSITIVE &&
|
||||
pdata->connect != NTC_CONNECTED_GROUND)) {
|
||||
(data->connect != NTC_CONNECTED_POSITIVE &&
|
||||
data->connect != NTC_CONNECTED_GROUND)) {
|
||||
dev_err(dev, "Required data to use NTC driver not supplied.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
data = devm_kzalloc(dev, sizeof(struct ntc_data), GFP_KERNEL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
|
||||
pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);
|
||||
|
||||
data->pdata = pdata;
|
||||
|
||||
if (pdev_id->driver_data >= ARRAY_SIZE(ntc_type)) {
|
||||
dev_err(dev, "Unknown device type: %lu(%s)\n",
|
||||
pdev_id->driver_data, pdev_id->name);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче