Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91556c69 authored by Peter Meerwald's avatar Peter Meerwald Committed by Jonathan Cameron
Browse files

iio:adc:ad799x: Only expose event interface when IRQ is available 



an IRQ is necessary to handle the ALERT condition; without
IRQ, the IIO event interface serves no purpose

Signed-off-by: default avatarPeter Meerwald <pmeerw@pmeerw.net>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent e1c6e2a2

drivers/iio/adc/ad799x.c

+179 −86
Original line number Diff line number Diff line
@@ -101,22 +101,32 @@ enum { 
};



/**

 * struct ad799x_chip_info - chip specific information

 * struct ad799x_chip_config - chip specific information

 * @channel:		channel specification

 * @num_channels:	number of channels

 * @default_config:	device default configuration

 * @info:		pointer to iio_info struct

 */

struct ad799x_chip_info {

struct ad799x_chip_config {

	struct iio_chan_spec		channel[9];

	int				num_channels;

	u16				default_config;

	const struct iio_info		*info;

};



/**

 * struct ad799x_chip_info - chip specific information

 * @num_channels:	number of channels

 * @noirq_config:	device configuration w/o IRQ

 * @irq_config:		device configuration w/IRQ

 */

struct ad799x_chip_info {

	int				num_channels;

	const struct ad799x_chip_config	noirq_config;

	const struct ad799x_chip_config	irq_config;

};



struct ad799x_state {

	struct i2c_client		*client;

	const struct ad799x_chip_info	*chip_info;

	const struct ad799x_chip_config	*chip_config;

	struct regulator		*reg;

	struct regulator		*vref;

	unsigned			id;
@@ -446,7 +456,13 @@ static const struct iio_info ad7991_info = { 
	.driver_module = THIS_MODULE,

};



static const struct iio_info ad7993_4_7_8_info = {

static const struct iio_info ad7993_4_7_8_noirq_info = {

	.read_raw = &ad799x_read_raw,

	.driver_module = THIS_MODULE,

	.update_scan_mode = ad7997_8_update_scan_mode,

};



static const struct iio_info ad7993_4_7_8_irq_info = {

	.read_raw = &ad799x_read_raw,

	.event_attrs = &ad799x_event_attrs_group,

	.read_event_config = &ad799x_read_event_config,
@@ -501,6 +517,8 @@ static const struct iio_event_spec ad799x_events[] = { 


static const struct ad799x_chip_info ad799x_chip_info_tbl[] = {

	[ad7991] = {

		.num_channels = 5,

		.noirq_config = {

			.channel = {

				AD799X_CHANNEL(0, 12),

				AD799X_CHANNEL(1, 12),
@@ -508,10 +526,12 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { 
				AD799X_CHANNEL(3, 12),

				IIO_CHAN_SOFT_TIMESTAMP(4),

			},

		.num_channels = 5,

			.info = &ad7991_info,

		},

	},

	[ad7995] = {

		.num_channels = 5,

		.noirq_config = {

			.channel = {

				AD799X_CHANNEL(0, 10),

				AD799X_CHANNEL(1, 10),
@@ -519,10 +539,12 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { 
				AD799X_CHANNEL(3, 10),

				IIO_CHAN_SOFT_TIMESTAMP(4),

			},

		.num_channels = 5,

			.info = &ad7991_info,

		},

	},

	[ad7999] = {

		.num_channels = 5,

		.noirq_config = {

			.channel = {

				AD799X_CHANNEL(0, 8),

				AD799X_CHANNEL(1, 8),
@@ -530,20 +552,42 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { 
				AD799X_CHANNEL(3, 8),

				IIO_CHAN_SOFT_TIMESTAMP(4),

			},

		.num_channels = 5,

			.info = &ad7991_info,

		},

	},

	[ad7992] = {

		.num_channels = 3,

		.noirq_config = {

			.channel = {

				AD799X_CHANNEL(0, 12),

				AD799X_CHANNEL(1, 12),

				IIO_CHAN_SOFT_TIMESTAMP(3),

			},

			.info = &ad7993_4_7_8_noirq_info,

		},

		.irq_config = {

			.channel = {

				AD799X_CHANNEL_WITH_EVENTS(0, 12),

				AD799X_CHANNEL_WITH_EVENTS(1, 12),

				IIO_CHAN_SOFT_TIMESTAMP(3),

			},

		.num_channels = 3,

			.default_config = AD7998_ALERT_EN,

		.info = &ad7993_4_7_8_info,

			.info = &ad7993_4_7_8_irq_info,

		},

	},

	[ad7993] = {

		.num_channels = 5,

		.noirq_config = {

			.channel = {

				AD799X_CHANNEL(0, 10),

				AD799X_CHANNEL(1, 10),

				AD799X_CHANNEL(2, 10),

				AD799X_CHANNEL(3, 10),

				IIO_CHAN_SOFT_TIMESTAMP(4),

			},

			.info = &ad7993_4_7_8_noirq_info,

		},

		.irq_config = {

			.channel = {

				AD799X_CHANNEL_WITH_EVENTS(0, 10),

				AD799X_CHANNEL_WITH_EVENTS(1, 10),
@@ -551,11 +595,23 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { 
				AD799X_CHANNEL_WITH_EVENTS(3, 10),

				IIO_CHAN_SOFT_TIMESTAMP(4),

			},

		.num_channels = 5,

			.default_config = AD7998_ALERT_EN,

		.info = &ad7993_4_7_8_info,

			.info = &ad7993_4_7_8_irq_info,

		},

	},

	[ad7994] = {

		.num_channels = 5,

		.noirq_config = {

			.channel = {

				AD799X_CHANNEL(0, 12),

				AD799X_CHANNEL(1, 12),

				AD799X_CHANNEL(2, 12),

				AD799X_CHANNEL(3, 12),

				IIO_CHAN_SOFT_TIMESTAMP(4),

			},

			.info = &ad7993_4_7_8_noirq_info,

		},

		.irq_config = {

			.channel = {

				AD799X_CHANNEL_WITH_EVENTS(0, 12),

				AD799X_CHANNEL_WITH_EVENTS(1, 12),
@@ -563,11 +619,27 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { 
				AD799X_CHANNEL_WITH_EVENTS(3, 12),

				IIO_CHAN_SOFT_TIMESTAMP(4),

			},

		.num_channels = 5,

			.default_config = AD7998_ALERT_EN,

		.info = &ad7993_4_7_8_info,

			.info = &ad7993_4_7_8_irq_info,

		},

	},

	[ad7997] = {

		.num_channels = 9,

		.noirq_config = {

			.channel = {

				AD799X_CHANNEL(0, 10),

				AD799X_CHANNEL(1, 10),

				AD799X_CHANNEL(2, 10),

				AD799X_CHANNEL(3, 10),

				AD799X_CHANNEL(4, 10),

				AD799X_CHANNEL(5, 10),

				AD799X_CHANNEL(6, 10),

				AD799X_CHANNEL(7, 10),

				IIO_CHAN_SOFT_TIMESTAMP(8),

			},

			.info = &ad7993_4_7_8_noirq_info,

		},

		.irq_config = {

			.channel = {

				AD799X_CHANNEL_WITH_EVENTS(0, 10),

				AD799X_CHANNEL_WITH_EVENTS(1, 10),
@@ -579,11 +651,27 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { 
				AD799X_CHANNEL(7, 10),

				IIO_CHAN_SOFT_TIMESTAMP(8),

			},

		.num_channels = 9,

			.default_config = AD7998_ALERT_EN,

		.info = &ad7993_4_7_8_info,

			.info = &ad7993_4_7_8_irq_info,

		},

	},

	[ad7998] = {

		.num_channels = 9,

		.noirq_config = {

			.channel = {

				AD799X_CHANNEL(0, 12),

				AD799X_CHANNEL(1, 12),

				AD799X_CHANNEL(2, 12),

				AD799X_CHANNEL(3, 12),

				AD799X_CHANNEL(4, 12),

				AD799X_CHANNEL(5, 12),

				AD799X_CHANNEL(6, 12),

				AD799X_CHANNEL(7, 12),

				IIO_CHAN_SOFT_TIMESTAMP(8),

			},

			.info = &ad7993_4_7_8_noirq_info,

		},

		.irq_config = {

			.channel = {

				AD799X_CHANNEL_WITH_EVENTS(0, 12),

				AD799X_CHANNEL_WITH_EVENTS(1, 12),
@@ -595,9 +683,9 @@ static const struct ad799x_chip_info ad799x_chip_info_tbl[] = { 
				AD799X_CHANNEL(7, 12),

				IIO_CHAN_SOFT_TIMESTAMP(8),

			},

		.num_channels = 9,

			.default_config = AD7998_ALERT_EN,

		.info = &ad7993_4_7_8_info,

			.info = &ad7993_4_7_8_irq_info,

		},

	},

};
@@ -607,6 +695,8 @@ static int ad799x_probe(struct i2c_client *client, 
	int ret;

	struct ad799x_state *st;

	struct iio_dev *indio_dev;

	const struct ad799x_chip_info *chip_info =

		&ad799x_chip_info_tbl[id->driver_data];



	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st));

	if (indio_dev == NULL)
@@ -617,8 +707,11 @@ static int ad799x_probe(struct i2c_client *client, 
	i2c_set_clientdata(client, indio_dev);



	st->id = id->driver_data;

	st->chip_info = &ad799x_chip_info_tbl[st->id];

	st->config = st->chip_info->default_config;

	if (client->irq > 0 && chip_info->irq_config.info)

		st->chip_config = &chip_info->irq_config;

	else

		st->chip_config = &chip_info->noirq_config;

	st->config = st->chip_config->default_config;



	/* TODO: Add pdata options for filtering and bit delay */
@@ -641,11 +734,11 @@ static int ad799x_probe(struct i2c_client *client, 


	indio_dev->dev.parent = &client->dev;

	indio_dev->name = id->name;

	indio_dev->info = st->chip_info->info;

	indio_dev->info = st->chip_config->info;



	indio_dev->modes = INDIO_DIRECT_MODE;

	indio_dev->channels = st->chip_info->channel;

	indio_dev->num_channels = st->chip_info->num_channels;

	indio_dev->channels = st->chip_config->channel;

	indio_dev->num_channels = chip_info->num_channels;



	ret = iio_triggered_buffer_setup(indio_dev, NULL,

		&ad799x_trigger_handler, NULL);