iio: adc: ad7091r: Move chip init data to container struct
AD7091R designs may differ on their communication protocol and resources required for proper setup. Extract what is design specific into a init_info struct so the base driver can use data and callback functions from that struct rather than checking which specific chip is connected during device initialization. Signed-off-by: Marcelo Schmitt <marcelo.schmitt@analog.com> Link: https://lore.kernel.org/r/1aca2261e227474dc58ce26442845947bcde9b14.1703013352.git.marcelo.schmitt1@gmail.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
committed by
Jonathan Cameron
parent
5b035ed0a5
commit
ca1a679049
@ -342,7 +342,7 @@ static void ad7091r_remove(void *data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int ad7091r_probe(struct device *dev, const char *name,
|
int ad7091r_probe(struct device *dev, const char *name,
|
||||||
const struct ad7091r_chip_info *chip_info,
|
const struct ad7091r_init_info *init_info,
|
||||||
struct regmap *map, int irq)
|
struct regmap *map, int irq)
|
||||||
{
|
{
|
||||||
struct iio_dev *iio_dev;
|
struct iio_dev *iio_dev;
|
||||||
@ -355,17 +355,16 @@ int ad7091r_probe(struct device *dev, const char *name,
|
|||||||
|
|
||||||
st = iio_priv(iio_dev);
|
st = iio_priv(iio_dev);
|
||||||
st->dev = dev;
|
st->dev = dev;
|
||||||
st->chip_info = chip_info;
|
init_info->init_adc_regmap(st, init_info->regmap_config);
|
||||||
st->map = map;
|
if (IS_ERR(st->map))
|
||||||
|
return dev_err_probe(st->dev, PTR_ERR(st->map),
|
||||||
|
"Error initializing regmap\n");
|
||||||
|
|
||||||
iio_dev->name = name;
|
|
||||||
iio_dev->info = &ad7091r_info;
|
iio_dev->info = &ad7091r_info;
|
||||||
iio_dev->modes = INDIO_DIRECT_MODE;
|
iio_dev->modes = INDIO_DIRECT_MODE;
|
||||||
|
|
||||||
iio_dev->num_channels = chip_info->num_channels;
|
|
||||||
iio_dev->channels = chip_info->channels;
|
|
||||||
|
|
||||||
if (irq) {
|
if (irq) {
|
||||||
|
st->chip_info = init_info->info_irq;
|
||||||
ret = regmap_update_bits(st->map, AD7091R_REG_CONF,
|
ret = regmap_update_bits(st->map, AD7091R_REG_CONF,
|
||||||
AD7091R_REG_CONF_ALERT_EN, BIT(4));
|
AD7091R_REG_CONF_ALERT_EN, BIT(4));
|
||||||
if (ret)
|
if (ret)
|
||||||
@ -377,8 +376,14 @@ int ad7091r_probe(struct device *dev, const char *name,
|
|||||||
IRQF_ONESHOT, name, iio_dev);
|
IRQF_ONESHOT, name, iio_dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
} else {
|
||||||
|
st->chip_info = init_info->info_no_irq;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
iio_dev->name = st->chip_info->name;
|
||||||
|
iio_dev->num_channels = st->chip_info->num_channels;
|
||||||
|
iio_dev->channels = st->chip_info->channels;
|
||||||
|
|
||||||
st->vref = devm_regulator_get_optional(dev, "vref");
|
st->vref = devm_regulator_get_optional(dev, "vref");
|
||||||
if (IS_ERR(st->vref)) {
|
if (IS_ERR(st->vref)) {
|
||||||
if (PTR_ERR(st->vref) == -EPROBE_DEFER)
|
if (PTR_ERR(st->vref) == -EPROBE_DEFER)
|
||||||
@ -433,14 +438,6 @@ bool ad7091r_volatile_reg(struct device *dev, unsigned int reg)
|
|||||||
}
|
}
|
||||||
EXPORT_SYMBOL_NS_GPL(ad7091r_volatile_reg, IIO_AD7091R);
|
EXPORT_SYMBOL_NS_GPL(ad7091r_volatile_reg, IIO_AD7091R);
|
||||||
|
|
||||||
const struct regmap_config ad7091r_regmap_config = {
|
|
||||||
.reg_bits = 8,
|
|
||||||
.val_bits = 16,
|
|
||||||
.writeable_reg = ad7091r_writeable_reg,
|
|
||||||
.volatile_reg = ad7091r_volatile_reg,
|
|
||||||
};
|
|
||||||
EXPORT_SYMBOL_NS_GPL(ad7091r_regmap_config, IIO_AD7091R);
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Beniamin Bia <beniamin.bia@analog.com>");
|
MODULE_AUTHOR("Beniamin Bia <beniamin.bia@analog.com>");
|
||||||
MODULE_DESCRIPTION("Analog Devices AD7091Rx multi-channel converters");
|
MODULE_DESCRIPTION("Analog Devices AD7091Rx multi-channel converters");
|
||||||
MODULE_LICENSE("GPL v2");
|
MODULE_LICENSE("GPL v2");
|
||||||
|
@ -8,6 +8,8 @@
|
|||||||
#ifndef __DRIVERS_IIO_ADC_AD7091R_BASE_H__
|
#ifndef __DRIVERS_IIO_ADC_AD7091R_BASE_H__
|
||||||
#define __DRIVERS_IIO_ADC_AD7091R_BASE_H__
|
#define __DRIVERS_IIO_ADC_AD7091R_BASE_H__
|
||||||
|
|
||||||
|
#include <linux/regmap.h>
|
||||||
|
|
||||||
#define AD7091R_REG_RESULT 0
|
#define AD7091R_REG_RESULT 0
|
||||||
#define AD7091R_REG_CHANNEL 1
|
#define AD7091R_REG_CHANNEL 1
|
||||||
#define AD7091R_REG_CONF 2
|
#define AD7091R_REG_CONF 2
|
||||||
@ -52,17 +54,24 @@ struct ad7091r_state {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct ad7091r_chip_info {
|
struct ad7091r_chip_info {
|
||||||
|
const char *name;
|
||||||
unsigned int num_channels;
|
unsigned int num_channels;
|
||||||
const struct iio_chan_spec *channels;
|
const struct iio_chan_spec *channels;
|
||||||
unsigned int vref_mV;
|
unsigned int vref_mV;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct ad7091r_init_info {
|
||||||
|
const struct ad7091r_chip_info *info_irq;
|
||||||
|
const struct ad7091r_chip_info *info_no_irq;
|
||||||
|
const struct regmap_config *regmap_config;
|
||||||
|
void (*init_adc_regmap)(struct ad7091r_state *st,
|
||||||
|
const struct regmap_config *regmap_conf);
|
||||||
|
};
|
||||||
|
|
||||||
extern const struct iio_event_spec ad7091r_events[3];
|
extern const struct iio_event_spec ad7091r_events[3];
|
||||||
|
|
||||||
extern const struct regmap_config ad7091r_regmap_config;
|
|
||||||
|
|
||||||
int ad7091r_probe(struct device *dev, const char *name,
|
int ad7091r_probe(struct device *dev, const char *name,
|
||||||
const struct ad7091r_chip_info *chip_info,
|
const struct ad7091r_init_info *init_info,
|
||||||
struct regmap *map, int irq);
|
struct regmap *map, int irq);
|
||||||
|
|
||||||
bool ad7091r_volatile_reg(struct device *dev, unsigned int reg);
|
bool ad7091r_volatile_reg(struct device *dev, unsigned int reg);
|
||||||
|
@ -27,42 +27,61 @@ static const struct iio_chan_spec ad7091r5_channels_noirq[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static const struct ad7091r_chip_info ad7091r5_chip_info_irq = {
|
static const struct ad7091r_chip_info ad7091r5_chip_info_irq = {
|
||||||
|
.name = "ad7091r-5",
|
||||||
.channels = ad7091r5_channels_irq,
|
.channels = ad7091r5_channels_irq,
|
||||||
.num_channels = ARRAY_SIZE(ad7091r5_channels_irq),
|
.num_channels = ARRAY_SIZE(ad7091r5_channels_irq),
|
||||||
.vref_mV = 2500,
|
.vref_mV = 2500,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct ad7091r_chip_info ad7091r5_chip_info_noirq = {
|
static const struct ad7091r_chip_info ad7091r5_chip_info_noirq = {
|
||||||
|
.name = "ad7091r-5",
|
||||||
.channels = ad7091r5_channels_noirq,
|
.channels = ad7091r5_channels_noirq,
|
||||||
.num_channels = ARRAY_SIZE(ad7091r5_channels_noirq),
|
.num_channels = ARRAY_SIZE(ad7091r5_channels_noirq),
|
||||||
.vref_mV = 2500,
|
.vref_mV = 2500,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct regmap_config ad7091r_regmap_config = {
|
||||||
|
.reg_bits = 8,
|
||||||
|
.val_bits = 16,
|
||||||
|
.writeable_reg = ad7091r_writeable_reg,
|
||||||
|
.volatile_reg = ad7091r_volatile_reg,
|
||||||
|
};
|
||||||
|
|
||||||
|
static void ad7091r5_regmap_init(struct ad7091r_state *st,
|
||||||
|
const struct regmap_config *regmap_conf)
|
||||||
|
{
|
||||||
|
struct i2c_client *i2c = container_of(st->dev, struct i2c_client, dev);
|
||||||
|
|
||||||
|
st->map = devm_regmap_init_i2c(i2c, regmap_conf);
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct ad7091r_init_info ad7091r5_init_info = {
|
||||||
|
.info_irq = &ad7091r5_chip_info_irq,
|
||||||
|
.info_no_irq = &ad7091r5_chip_info_noirq,
|
||||||
|
.regmap_config = &ad7091r_regmap_config,
|
||||||
|
.init_adc_regmap = &ad7091r5_regmap_init
|
||||||
|
};
|
||||||
|
|
||||||
static int ad7091r5_i2c_probe(struct i2c_client *i2c)
|
static int ad7091r5_i2c_probe(struct i2c_client *i2c)
|
||||||
{
|
{
|
||||||
const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
|
const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
|
||||||
const struct ad7091r_chip_info *chip_info;
|
const struct ad7091r_init_info *init_info;
|
||||||
struct regmap *map = devm_regmap_init_i2c(i2c, &ad7091r_regmap_config);
|
|
||||||
|
|
||||||
if (IS_ERR(map))
|
init_info = i2c_get_match_data(i2c);
|
||||||
return PTR_ERR(map);
|
if (!init_info)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
if (i2c->irq)
|
return ad7091r_probe(&i2c->dev, id->name, init_info, NULL, i2c->irq);
|
||||||
chip_info = &ad7091r5_chip_info_irq;
|
|
||||||
else
|
|
||||||
chip_info = &ad7091r5_chip_info_noirq;
|
|
||||||
|
|
||||||
return ad7091r_probe(&i2c->dev, id->name, chip_info, map, i2c->irq);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id ad7091r5_dt_ids[] = {
|
static const struct of_device_id ad7091r5_dt_ids[] = {
|
||||||
{ .compatible = "adi,ad7091r5" },
|
{ .compatible = "adi,ad7091r5", .data = &ad7091r5_init_info },
|
||||||
{},
|
{},
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, ad7091r5_dt_ids);
|
MODULE_DEVICE_TABLE(of, ad7091r5_dt_ids);
|
||||||
|
|
||||||
static const struct i2c_device_id ad7091r5_i2c_ids[] = {
|
static const struct i2c_device_id ad7091r5_i2c_ids[] = {
|
||||||
{"ad7091r5", 0},
|
{"ad7091r5", (kernel_ulong_t)&ad7091r5_init_info },
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(i2c, ad7091r5_i2c_ids);
|
MODULE_DEVICE_TABLE(i2c, ad7091r5_i2c_ids);
|
||||||
|
Reference in New Issue
Block a user