mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 00:53:34 +02:00
iio: light: al3010: Implement regmap support
Modernize and clean up the driver using the regmap framework. With the regmap implementation, the compiler produces a significantly smaller module. Size before: 72 kB Size after: 58 kB Signed-off-by: David Heidelberg <david@ixit.cz> Link: https://patch.msgid.link/20250402-al3010-iio-regmap-v4-4-d189bea87261@ixit.cz Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
parent
b8154f3477
commit
0e5e21e23d
|
|
@ -17,6 +17,7 @@
|
|||
#include <linux/bitfield.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/mod_devicetable.h>
|
||||
|
||||
#include <linux/iio/iio.h>
|
||||
|
|
@ -44,8 +45,14 @@ static const int al3010_scales[][2] = {
|
|||
{0, 1187200}, {0, 296800}, {0, 74200}, {0, 18600}
|
||||
};
|
||||
|
||||
static const struct regmap_config al3010_regmap_config = {
|
||||
.reg_bits = 8,
|
||||
.val_bits = 8,
|
||||
.max_register = AL3010_REG_CONFIG,
|
||||
};
|
||||
|
||||
struct al3010_data {
|
||||
struct i2c_client *client;
|
||||
struct regmap *regmap;
|
||||
};
|
||||
|
||||
static const struct iio_chan_spec al3010_channels[] = {
|
||||
|
|
@ -67,41 +74,36 @@ static const struct attribute_group al3010_attribute_group = {
|
|||
.attrs = al3010_attributes,
|
||||
};
|
||||
|
||||
static int al3010_set_pwr_on(struct i2c_client *client)
|
||||
static int al3010_set_pwr_on(struct al3010_data *data)
|
||||
{
|
||||
return i2c_smbus_write_byte_data(client, AL3010_REG_SYSTEM,
|
||||
AL3010_CONFIG_ENABLE);
|
||||
return regmap_write(data->regmap, AL3010_REG_SYSTEM, AL3010_CONFIG_ENABLE);
|
||||
}
|
||||
|
||||
static void al3010_set_pwr_off(void *_data)
|
||||
{
|
||||
struct al3010_data *data = _data;
|
||||
struct device *dev = regmap_get_device(data->regmap);
|
||||
int ret;
|
||||
|
||||
i2c_smbus_write_byte_data(data->client, AL3010_REG_SYSTEM,
|
||||
AL3010_CONFIG_DISABLE);
|
||||
ret = regmap_write(data->regmap, AL3010_REG_SYSTEM, AL3010_CONFIG_DISABLE);
|
||||
if (ret)
|
||||
dev_err(dev, "failed to write system register\n");
|
||||
}
|
||||
|
||||
static int al3010_init(struct al3010_data *data)
|
||||
{
|
||||
struct device *dev = regmap_get_device(data->regmap);
|
||||
int ret;
|
||||
|
||||
ret = al3010_set_pwr_on(data->client);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = devm_add_action_or_reset(&data->client->dev,
|
||||
al3010_set_pwr_off,
|
||||
data);
|
||||
ret = al3010_set_pwr_on(data);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = i2c_smbus_write_byte_data(data->client, AL3010_REG_CONFIG,
|
||||
FIELD_PREP(AL3010_GAIN_MASK,
|
||||
AL3XXX_RANGE_3));
|
||||
if (ret < 0)
|
||||
ret = devm_add_action_or_reset(dev, al3010_set_pwr_off, data);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
return regmap_write(data->regmap, AL3010_REG_CONFIG,
|
||||
FIELD_PREP(AL3010_GAIN_MASK, AL3XXX_RANGE_3));
|
||||
}
|
||||
|
||||
static int al3010_read_raw(struct iio_dev *indio_dev,
|
||||
|
|
@ -109,7 +111,7 @@ static int al3010_read_raw(struct iio_dev *indio_dev,
|
|||
int *val2, long mask)
|
||||
{
|
||||
struct al3010_data *data = iio_priv(indio_dev);
|
||||
int ret;
|
||||
int ret, gain, raw;
|
||||
|
||||
switch (mask) {
|
||||
case IIO_CHAN_INFO_RAW:
|
||||
|
|
@ -118,21 +120,21 @@ static int al3010_read_raw(struct iio_dev *indio_dev,
|
|||
* - low byte of output is stored at AL3010_REG_DATA_LOW
|
||||
* - high byte of output is stored at AL3010_REG_DATA_LOW + 1
|
||||
*/
|
||||
ret = i2c_smbus_read_word_data(data->client,
|
||||
AL3010_REG_DATA_LOW);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
*val = ret;
|
||||
return IIO_VAL_INT;
|
||||
case IIO_CHAN_INFO_SCALE:
|
||||
ret = i2c_smbus_read_byte_data(data->client,
|
||||
AL3010_REG_CONFIG);
|
||||
if (ret < 0)
|
||||
ret = regmap_read(data->regmap, AL3010_REG_DATA_LOW, &raw);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = FIELD_GET(AL3010_GAIN_MASK, ret);
|
||||
*val = al3010_scales[ret][0];
|
||||
*val2 = al3010_scales[ret][1];
|
||||
*val = raw;
|
||||
|
||||
return IIO_VAL_INT;
|
||||
case IIO_CHAN_INFO_SCALE:
|
||||
ret = regmap_read(data->regmap, AL3010_REG_CONFIG, &gain);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
gain = FIELD_GET(AL3010_GAIN_MASK, gain);
|
||||
*val = al3010_scales[gain][0];
|
||||
*val2 = al3010_scales[gain][1];
|
||||
|
||||
return IIO_VAL_INT_PLUS_MICRO;
|
||||
}
|
||||
|
|
@ -153,9 +155,8 @@ static int al3010_write_raw(struct iio_dev *indio_dev,
|
|||
val2 != al3010_scales[i][1])
|
||||
continue;
|
||||
|
||||
return i2c_smbus_write_byte_data(data->client,
|
||||
AL3010_REG_CONFIG,
|
||||
FIELD_PREP(AL3010_GAIN_MASK, i));
|
||||
return regmap_write(data->regmap, AL3010_REG_CONFIG,
|
||||
FIELD_PREP(AL3010_GAIN_MASK, i));
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -181,7 +182,10 @@ static int al3010_probe(struct i2c_client *client)
|
|||
|
||||
data = iio_priv(indio_dev);
|
||||
i2c_set_clientdata(client, indio_dev);
|
||||
data->client = client;
|
||||
data->regmap = devm_regmap_init_i2c(client, &al3010_regmap_config);
|
||||
if (IS_ERR(data->regmap))
|
||||
return dev_err_probe(dev, PTR_ERR(data->regmap),
|
||||
"cannot allocate regmap\n");
|
||||
|
||||
indio_dev->info = &al3010_info;
|
||||
indio_dev->name = "al3010";
|
||||
|
|
@ -206,7 +210,9 @@ static int al3010_suspend(struct device *dev)
|
|||
|
||||
static int al3010_resume(struct device *dev)
|
||||
{
|
||||
return al3010_set_pwr_on(to_i2c_client(dev));
|
||||
struct al3010_data *data = iio_priv(dev_get_drvdata(dev));
|
||||
|
||||
return al3010_set_pwr_on(data);
|
||||
}
|
||||
|
||||
static DEFINE_SIMPLE_DEV_PM_OPS(al3010_pm_ops, al3010_suspend, al3010_resume);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user