staging:iio: Add support for multiple buffers
Subsystems (5)
Jonathan Cameron
maintainerv3 cover staging:iio: Add support for multiple buffers
Changes since V2.
Improved handling of error conditions in the buffer insertion and removal code. (suggested by Lars-Peter). I want to take another look at these, but didn't want to keep people from testing this in the meantime.
Also a number of minor fixes that came up during testing.
Thanks,
Jonathan
Jonathan Cameron (4):
staging:iio: Add support for multiple buffers staging:iio:in kernel users: Add a data field for channel specific
info.
staging:iio: add a callback buffer for in kernel push interface staging:iio: Proof of concept input driver.
drivers/iio/Kconfig | 6 + drivers/iio/Makefile | 1 + drivers/iio/adc/at91_adc.c | 4 +- drivers/iio/buffer_cb.c | 115 +++++++ drivers/iio/industrialio-buffer.c | 378 ++++++++++++++++-------- drivers/iio/industrialio-core.c | 1 + drivers/iio/inkern.c | 1 + drivers/staging/iio/Kconfig | 11 + drivers/staging/iio/Makefile | 1 + drivers/staging/iio/accel/adis16201_ring.c | 4 +- drivers/staging/iio/accel/adis16203_ring.c | 6 +- drivers/staging/iio/accel/adis16204_ring.c | 3 +- drivers/staging/iio/accel/adis16209_ring.c | 3 +- drivers/staging/iio/accel/adis16240_ring.c | 4 +- drivers/staging/iio/accel/lis3l02dq_ring.c | 3 +- drivers/staging/iio/adc/ad7192.c | 3 +- drivers/staging/iio/adc/ad7298_ring.c | 5 +- drivers/staging/iio/adc/ad7476_ring.c | 2 +- drivers/staging/iio/adc/ad7606_ring.c | 3 +- drivers/staging/iio/adc/ad7793.c | 3 +- drivers/staging/iio/adc/ad7887_ring.c | 2 +- drivers/staging/iio/adc/ad799x_ring.c | 3 +- drivers/staging/iio/adc/max1363_ring.c | 2 +- drivers/staging/iio/gyro/adis16260_ring.c | 3 +- drivers/staging/iio/iio_input.c | 221 ++++++++++++++ drivers/staging/iio/iio_input.h | 23 ++ drivers/staging/iio/iio_simple_dummy_buffer.c | 5 +- drivers/staging/iio/impedance-analyzer/ad5933.c | 3 +- drivers/staging/iio/imu/adis16400_ring.c | 2 +- drivers/staging/iio/meter/ade7758_ring.c | 3 +- include/linux/iio/buffer.h | 24 +- include/linux/iio/consumer.h | 48 +++ include/linux/iio/iio.h | 2 + include/linux/iio/machine.h | 2 + 34 files changed, 734 insertions(+), 166 deletions(-) create mode 100644 drivers/iio/buffer_cb.c create mode 100644 drivers/staging/iio/iio_input.c create mode 100644 drivers/staging/iio/iio_input.h
Signature · 1 line
1.7.11.1
Jonathan Cameron
maintainerPATCH v3 1/4 staging:iio: Add support for multiple buffers
Route all buffer writes through the demux. Addition or removal of a buffer results in tear down and setup of all the buffers for a given device.
--- drivers/iio/adc/at91_adc.c | 4 +- drivers/iio/industrialio-buffer.c | 378 ++++++++++++++++-------- drivers/iio/industrialio-core.c | 1 + drivers/staging/iio/accel/adis16201_ring.c | 4 +- drivers/staging/iio/accel/adis16203_ring.c | 6 +- drivers/staging/iio/accel/adis16204_ring.c | 3 +- drivers/staging/iio/accel/adis16209_ring.c | 3 +- drivers/staging/iio/accel/adis16240_ring.c | 4 +- drivers/staging/iio/accel/lis3l02dq_ring.c | 3 +- drivers/staging/iio/adc/ad7192.c | 3 +- drivers/staging/iio/adc/ad7298_ring.c | 5 +- drivers/staging/iio/adc/ad7476_ring.c | 2 +- drivers/staging/iio/adc/ad7606_ring.c | 3 +- drivers/staging/iio/adc/ad7793.c | 3 +- drivers/staging/iio/adc/ad7887_ring.c | 2 +- drivers/staging/iio/adc/ad799x_ring.c | 3 +- drivers/staging/iio/adc/max1363_ring.c | 2 +- drivers/staging/iio/gyro/adis16260_ring.c | 3 +- drivers/staging/iio/iio_simple_dummy_buffer.c | 5 +- drivers/staging/iio/impedance-analyzer/ad5933.c | 3 +- drivers/staging/iio/imu/adis16400_ring.c | 2 +- drivers/staging/iio/meter/ade7758_ring.c | 3 +- include/linux/iio/buffer.h | 24 +- include/linux/iio/iio.h | 2 + 24 files changed, 305 insertions(+), 166 deletions(-)
drivers/iio/adc/at91_adc.c +1 -3
@@ -66,7 +66,6 @@ static irqreturn_t at91_adc_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *idev = pf->indio_dev;struct at91_adc_state *st =iio_priv (idev); -struct iio_buffer *buffer = idev->buffer;int i, j =0 ;for (i =0 ; i < idev->masklength; i++) {
@@ -81,8 +80,7 @@ static irqreturn_t at91_adc_trigger_handler(int irq, void *p) ALIGN(j, sizeof(s64))); *timestamp = pf->timestamp; } - - buffer->access->store_to (buffer, (u8 *)st->buffer, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)st->buffer, pf->timestamp);iio_trigger_notify_done (idev->trig); st->irq_enabled = true;
drivers/iio/industrialio-buffer.c +261 -117
465 lines not on this page · raw message
drivers/iio/industrialio-core.c +1 -0
@@ -839,6 +839,7 @@ struct iio_dev *iio_device_alloc(int sizeof_priv)return NULL ; }dev_set_name (&dev->dev,"iio:device%d" , dev->id); +INIT_LIST_HEAD (&dev->buffer_list); }return dev;
drivers/staging/iio/accel/adis16201_ring.c +1 -3
@@ -62,8 +62,6 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct adis16201_state *st =iio_priv (indio_dev); -struct iio_buffer *ring = indio_dev->buffer; -int i =0 ;s16 *data;
@@ -83,7 +81,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)if (indio_dev->scan_timestamp) *((s64 *)(data + ((i +3 )/4 )*4 )) = pf->timestamp; - ring->access->store_to (ring, (u8 *)data, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)data, pf->timestamp);iio_trigger_notify_done (indio_dev->trig);kfree (data);
drivers/staging/iio/accel/adis16203_ring.c +1 -5
@@ -61,8 +61,6 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct adis16203_state *st =iio_priv (indio_dev); -struct iio_buffer *ring = indio_dev->buffer; -int i =0 ;s16 *data;
@@ -82,9 +80,7 @@ static irqreturn_t adis16203_trigger_handler(int irq, void *p)if (indio_dev->scan_timestamp) *((s64 *)(data + ((i +3 )/4 )*4 )) = pf->timestamp; - ring->access->store_to (ring, - (u8 *)data, - pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)data, pf->timestamp);iio_trigger_notify_done (indio_dev->trig);kfree (data);
drivers/staging/iio/accel/adis16204_ring.c +1 -2
@@ -59,7 +59,6 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct adis16204_state *st =iio_priv (indio_dev); -struct iio_buffer *ring = indio_dev->buffer;int i =0 ;s16 *data;
@@ -79,7 +78,7 @@ static irqreturn_t adis16204_trigger_handler(int irq, void *p)if (indio_dev->scan_timestamp) *((s64 *)(data + ((i +3 )/4 )*4 )) = pf->timestamp; - ring->access->store_to (ring, (u8 *)data, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)data, pf->timestamp);iio_trigger_notify_done (indio_dev->trig);kfree (data);
drivers/staging/iio/accel/adis16209_ring.c +1 -2
@@ -59,7 +59,6 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct adis16209_state *st =iio_priv (indio_dev); -struct iio_buffer *ring = indio_dev->buffer;int i =0 ;s16 *data;
@@ -79,7 +78,7 @@ static irqreturn_t adis16209_trigger_handler(int irq, void *p)if (indio_dev->scan_timestamp) *((s64 *)(data + ((i +3 )/4 )*4 )) = pf->timestamp; - ring->access->store_to (ring, (u8 *)data, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)data, pf->timestamp);iio_trigger_notify_done (indio_dev->trig);kfree (data);
drivers/staging/iio/accel/adis16240_ring.c +1 -3
@@ -56,8 +56,6 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct adis16240_state *st =iio_priv (indio_dev); -struct iio_buffer *ring = indio_dev->buffer; -int i =0 ;s16 *data;
@@ -77,7 +75,7 @@ static irqreturn_t adis16240_trigger_handler(int irq, void *p)if (indio_dev->scan_timestamp) *((s64 *)(data + ((i +3 )/4 )*4 )) = pf->timestamp; - ring->access->store_to (ring, (u8 *)data, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)data, pf->timestamp);iio_trigger_notify_done (indio_dev->trig);kfree (data);
drivers/staging/iio/accel/lis3l02dq_ring.c +1 -2
@@ -135,7 +135,6 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p) {struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev; -struct iio_buffer *buffer = indio_dev->buffer;int len =0 ;char *data;
@@ -154,7 +153,7 @@ static irqreturn_t lis3l02dq_trigger_handler(int irq, void *p) *(s64 *)(((phys_addr_t )data + len +sizeof (s64) -1 ) & ~(sizeof (s64) -1 )) = pf->timestamp; - buffer->access->store_to (buffer, (u8 *)data, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)data, pf->timestamp);iio_trigger_notify_done (indio_dev->trig);kfree (data);
drivers/staging/iio/adc/ad7192.c +1 -2
@@ -510,7 +510,6 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p) {struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev; -struct iio_buffer *ring = indio_dev->buffer;struct ad7192_state *st =iio_priv (indio_dev);s64 dat64[2 ];s32 *dat32 = (s32 *)dat64;
@@ -524,7 +523,7 @@ static irqreturn_t ad7192_trigger_handler(int irq, void *p)if (indio_dev->scan_timestamp) dat64[1 ] = pf->timestamp; - ring->access->store_to (ring, (u8 *)dat64, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)dat64, pf->timestamp);iio_trigger_notify_done (indio_dev->trig); st->irq_dis = false;
drivers/staging/iio/adc/ad7298_ring.c +2 -3
@@ -75,7 +75,6 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct ad7298_state *st =iio_priv (indio_dev); -struct iio_buffer *ring = indio_dev->buffer;s64 time_ns;__u16 buf[16 ];int b_sent, i;
@@ -91,10 +90,10 @@ static irqreturn_t ad7298_trigger_handler(int irq, void *p) }for (i =0 ; i <bitmap_weight (indio_dev->active_scan_mask, - indio_dev->masklength); i++) + indio_dev->masklength); i++) buf[i] =be16_to_cpu (st->rx_buf[i]); - indio_dev->buffer->access->store_to (ring, (u8 *)buf, time_ns); +iio_push_to_buffers (indio_dev, (u8 *)buf, time_ns);iio_trigger_notify_done (indio_dev->trig);return IRQ_HANDLED ;
drivers/staging/iio/adc/ad7476_ring.c +1 -1
@@ -44,7 +44,7 @@ static irqreturn_t ad7476_trigger_handler(int irq, void *p)memcpy (rxbuf + indio_dev->scan_bytes -sizeof (s64), &time_ns,sizeof (time_ns)); - indio_dev->buffer->access->store_to (indio_dev->buffer, rxbuf, time_ns); +iio_push_to_buffers (indio_dev, rxbuf, time_ns); done:iio_trigger_notify_done (indio_dev->trig);kfree (rxbuf);
drivers/staging/iio/adc/ad7606_ring.c +1 -2
@@ -46,7 +46,6 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s) struct ad7606_state *st = container_of(work_s, struct ad7606_state, poll_work);struct iio_dev *indio_dev =iio_priv_to_dev (st); -struct iio_buffer *ring = indio_dev->buffer;s64 time_ns;__u8 *buf;int ret;
@@ -84,7 +83,7 @@ static void ad7606_poll_bh_to_ring(struct work_struct *work_s)if (indio_dev->scan_timestamp) *((s64 *)(buf + indio_dev->scan_bytes -sizeof (s64))) = time_ns; - ring->access->store_to (indio_dev->buffer, buf, time_ns); +iio_push_to_buffers (indio_dev, buf, time_ns); done:gpio_set_value (st->pdata->gpio_convst,0 );iio_trigger_notify_done (indio_dev->trig);
drivers/staging/iio/adc/ad7793.c +1 -2
@@ -375,7 +375,6 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p) {struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev; -struct iio_buffer *ring = indio_dev->buffer;struct ad7793_state *st =iio_priv (indio_dev);s64 dat64[2 ];s32 *dat32 = (s32 *)dat64;
@@ -389,7 +388,7 @@ static irqreturn_t ad7793_trigger_handler(int irq, void *p)if (indio_dev->scan_timestamp) dat64[1 ] = pf->timestamp; - ring->access->store_to (ring, (u8 *)dat64, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)dat64, pf->timestamp);iio_trigger_notify_done (indio_dev->trig); st->irq_dis = false;
drivers/staging/iio/adc/ad7887_ring.c +1 -1
@@ -95,7 +95,7 @@ static irqreturn_t ad7887_trigger_handler(int irq, void *p)memcpy (buf + indio_dev->scan_bytes -sizeof (s64), &time_ns,sizeof (time_ns)); - indio_dev->buffer->access->store_to (indio_dev->buffer, buf, time_ns); +iio_push_to_buffers (indio_dev, buf, time_ns); done:kfree (buf);iio_trigger_notify_done (indio_dev->trig);
drivers/staging/iio/adc/ad799x_ring.c +1 -2
@@ -35,7 +35,6 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct ad799x_state *st =iio_priv (indio_dev); -struct iio_buffer *ring = indio_dev->buffer;s64 time_ns;__u8 *rxbuf;int b_sent;
@@ -78,7 +77,7 @@ static irqreturn_t ad799x_trigger_handler(int irq, void *p)memcpy (rxbuf + indio_dev->scan_bytes -sizeof (s64), &time_ns,sizeof (time_ns)); - ring->access->store_to (indio_dev->buffer, rxbuf, time_ns); +iio_push_to_buffers (indio_dev, rxbuf, time_ns); done:kfree (rxbuf);if (b_sent <0 )
drivers/staging/iio/adc/max1363_ring.c +1 -1
@@ -80,7 +80,7 @@ static irqreturn_t max1363_trigger_handler(int irq, void *p)if (indio_dev->scan_timestamp)memcpy (rxbuf + d_size -sizeof (s64), &time_ns,sizeof (time_ns)); -iio_push_to_buffer (indio_dev->buffer, rxbuf, time_ns); +iio_push_to_buffers (indio_dev, rxbuf, time_ns); done:iio_trigger_notify_done (indio_dev->trig);
drivers/staging/iio/gyro/adis16260_ring.c +1 -2
@@ -62,7 +62,6 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct adis16260_state *st =iio_priv (indio_dev); -struct iio_buffer *ring = indio_dev->buffer;int i =0 ;s16 *data;
@@ -82,7 +81,7 @@ static irqreturn_t adis16260_trigger_handler(int irq, void *p)if (indio_dev->scan_timestamp) *((s64 *)(data + ((i +3 )/4 )*4 )) = pf->timestamp; - ring->access->store_to (ring, (u8 *)data, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)data, pf->timestamp);iio_trigger_notify_done (indio_dev->trig);kfree (data);
drivers/staging/iio/iio_simple_dummy_buffer.c +2 -3
@@ -46,7 +46,6 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p) {struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev; -struct iio_buffer *buffer = indio_dev->buffer;int len =0 ;u16 *data;
@@ -76,7 +75,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p) i <bitmap_weight (indio_dev->active_scan_mask, indio_dev->masklength); i++, j++) { - j =find_next_bit (buffer->scan_mask, + j =find_next_bit (indio_dev->active_scan_mask, indio_dev->masklength, j);/* random access read from the 'device' */ data[i] = fakedata[j];
@@ -87,7 +86,7 @@ static irqreturn_t iio_simple_dummy_trigger_h(int irq, void *p)if (indio_dev->scan_timestamp) *(s64 *)((phys_addr_t )data +ALIGN (len,sizeof (s64))) =iio_get_time_ns (); - buffer->access->store_to (buffer, (u8 *)data, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)data, pf->timestamp);kfree (data);
drivers/staging/iio/impedance-analyzer/ad5933.c +1 -2
@@ -647,7 +647,6 @@ static void ad5933_work(struct work_struct *work)struct ad5933_state *st =container_of (work, struct ad5933_state, work.work);struct iio_dev *indio_dev =i2c_get_clientdata (st->client); -struct iio_buffer *ring = indio_dev->buffer;signed short buf[2 ];unsigned char status;
@@ -678,7 +677,7 @@ static void ad5933_work(struct work_struct *work) buf[0 ] =be16_to_cpu (buf[0 ]); }/* save datum to the ring */ - ring->access->store_to (ring, (u8 *)buf,iio_get_time_ns ()); +iio_push_to_buffers (indio_dev, (u8 *)buf,iio_get_time_ns ()); }else {/* no data available - try again later */ schedule_delayed_work (&st->work, st->poll_time_jiffies);
drivers/staging/iio/imu/adis16400_ring.c +1 -1
@@ -150,7 +150,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)/* Guaranteed to be aligned with 8 byte boundary */ if (ring->scan_timestamp) *((s64 *)(data + ((i +3 )/4 )*4 )) = pf->timestamp; - ring->access->store_to (indio_dev->buffer, (u8 *) data, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *) data, pf->timestamp);iio_trigger_notify_done (indio_dev->trig);
drivers/staging/iio/meter/ade7758_ring.c +1 -2
@@ -61,7 +61,6 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p) {struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev; -struct iio_buffer *ring = indio_dev->buffer;struct ade7758_state *st =iio_priv (indio_dev);s64 dat64[2 ];u32 *dat32 = (u32 *)dat64;
@@ -74,7 +73,7 @@ static irqreturn_t ade7758_trigger_handler(int irq, void *p)if (indio_dev->scan_timestamp) dat64[1 ] = pf->timestamp; - ring->access->store_to (ring, (u8 *)dat64, pf->timestamp); +iio_push_to_buffers (indio_dev, (u8 *)dat64, pf->timestamp);iio_trigger_notify_done (indio_dev->trig);
include/linux/iio/buffer.h +19 -5
@@ -66,7 +66,8 @@ struct iio_buffer_access_funcs {* @stufftoread: [INTERN] flag to indicate new data. * @demux_list: [INTERN] list of operations required to demux the scan. * @demux_bounce: [INTERN] buffer for doing gather from incoming scan. -**/ +* @buffer_list: [INTERN] entry in the devices list of current buffers. +*/ struct iio_buffer {int length;int bytes_per_datum;
@@ -81,9 +82,22 @@ struct iio_buffer {const struct attribute_group *attrs;struct list_head demux_list;unsigned char *demux_bounce; +struct list_head buffer_list; };/** +* iio_update_buffers() - add or remove buffer from active list +* @indio_dev: device to add buffer to +* @insert_buffer: buffer to insert +* @remove_buffer: buffer_to_remove +* +* Note this will tear down the all buffering and build it up again +*/ +int iio_update_buffers (struct iio_dev *indio_dev, +struct iio_buffer *insert_buffer, +struct iio_buffer *remove_buffer); + +/** * iio_buffer_init() - Initialize the buffer structure * @buffer: buffer to be initialized **/
@@ -114,12 +128,12 @@ int iio_scan_mask_set(struct iio_dev *indio_dev, struct iio_buffer *buffer, int bit);/** -* iio_push_to_buffer() - push to a registered buffer. -* @buffer: IIO buffer structure for device -* @scan: Full scan. +* iio_push_to_buffers() - push to a registered buffer. +* @indio_dev: iio_dev structure for device. +* @data: Full scan. * @timestamp: */ -int iio_push_to_buffer (struct iio_buffer *buffer,unsigned char *data, +int iio_push_to_buffers (struct iio_dev *indio_dev,unsigned char *data,s64 timestamp);int iio_update_demux (struct iio_dev *indio_dev);
include/linux/iio/iio.h +2 -0
@@ -380,6 +380,7 @@ struct iio_buffer_setup_ops {* and owner * @event_interface: [INTERN] event chrdevs associated with interrupt lines * @buffer: [DRIVER] any buffer present +* @buffer_list: [INTERN] list of all buffers currently attached * @scan_bytes: [INTERN] num bytes captured to be fed to buffer demux * @mlock: [INTERN] lock used to prevent simultaneous device state * changes
@@ -418,6 +419,7 @@ struct iio_dev {struct iio_event_interface *event_interface;struct iio_buffer *buffer; +struct list_head buffer_list;int scan_bytes;struct mutex mlock;
Signature · 1 line
1.7.11.1
Jonathan Cameron
maintainerPATCH v3 2/4 staging:iio:in kernel users: Add a data field for channel specific info.
In reply to Jonathan CameronUsed to allow information about a given channel mapping to be passed through from board files to the consumer drivers.
--- drivers/iio/inkern.c | 1 + include/linux/iio/consumer.h | 2 ++ include/linux/iio/machine.h | 2 ++ 3 files changed, 5 insertions(+)
drivers/iio/inkern.c +1 -0
@@ -188,6 +188,7 @@ struct iio_channel *iio_channel_get_all(const char *name)if (name &&strcmp (name, c->map->consumer_dev_name) !=0 )continue ; chans[mapind].indio_dev = c->indio_dev; + chans[mapind].data = c->map->consumer_data; chans[mapind].channel =iio_chan_spec_from_name (chans[mapind].indio_dev, c->map->adc_channel_label);
include/linux/iio/consumer.h +2 -0
@@ -18,10 +18,12 @@ struct iio_chan_spec;* struct iio_channel - everything needed for a consumer to use a channel * @indio_dev: Device on which the channel exists. * @channel: Full description of the channel. +* @data: Data about the channel used by consumer. */ struct iio_channel {struct iio_dev *indio_dev;const struct iio_chan_spec *channel; +void *data; };/**
include/linux/iio/machine.h +2 -0
@@ -16,9 +16,11 @@* @consumer_dev_name: Name to uniquely identify the consumer device. * @consumer_channel: Unique name used to identify the channel on the * consumer side. +* @consumer_data: Data about the channel for use by the consumer driver. */ struct iio_map {const char *adc_channel_label;const char *consumer_dev_name;const char *consumer_channel; +void *consumer_data; };
Signature · 1 line
1.7.11.1
Jonathan Cameron
maintainerPATCH v3 3/4 staging:iio: add a callback buffer for in kernel push interface
In reply to Jonathan CameronThis callback buffer is meant to be opaque to users, but basically adds a very simple pass through buffer to which data may be pushed when it is inserted into the buffer list.
--- drivers/iio/Kconfig | 6 +++ drivers/iio/Makefile | 1 + drivers/iio/buffer_cb.c | 115 +++++++++++++++++++++++++++++++++++++++++++ include/linux/iio/consumer.h | 46 +++++++++++++++++ 4 files changed, 168 insertions(+)
drivers/iio/Kconfig +6 -0
@@ -20,6 +20,12 @@ config IIO_BUFFER if IIO_BUFFER +config IIO_BUFFER_CB + boolean "IIO callback buffer used for push in kernel interfaces" + help + Should be selected by any drivers that do inkernel push + usage. That is, those where the data is pushed to the consumer. + config IIO_KFIFO_BUF select IIO_TRIGGER tristate "Industrial I/O buffering based on kfifo"
drivers/iio/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_IIO) += industrialio.o industrialio-y := industrialio-core.o industrialio-event.o inkern.o industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o +industrialio-$(CONFIG_IIO_BUFFER_CB) += buffer_cb.o obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o
drivers/iio/buffer_cb.c new file +115 -0
115 lines not on this page · raw message
include/linux/iio/consumer.h +46 -0
52 lines not on this page · raw message
Signature · 1 line
1.7.11.1
Jonathan Cameron
maintainerPATCH v3 4/4 staging:iio: Proof of concept input driver.
In reply to Jonathan CameronFrom: Jonathan Cameron <[email protected]>
This is no where near ready to merge. Lots of stuff missing.
--- drivers/staging/iio/Kconfig | 11 ++ drivers/staging/iio/Makefile | 1 + drivers/staging/iio/iio_input.c | 221 ++++++++++++++++++++++++++++++++++++++++ drivers/staging/iio/iio_input.h | 23 +++++ 4 files changed, 256 insertions(+)
drivers/staging/iio/Kconfig +11 -0
@@ -4,6 +4,17 @@ menu "IIO staging drivers" depends on IIO +config IIO_ST_INPUT + tristate "Input driver that uses channels specified via iio maps" + depends on INPUT + depends on IIO_BUFFER + select IIO_BUFFER_CB + help + Client driver for IIO via the push interfaces. Used to provide + and input interface for IIO devices that can feed a buffer on + a trigger interrupt. Note that all channels must come from a + single IIO supported device. + config IIO_ST_HWMON tristate "Hwmon driver that uses channels specified via iio maps" depends on HWMON
drivers/staging/iio/Makefile +1 -0
@@ -12,6 +12,7 @@ iio_dummy-$(CONFIG_IIO_SIMPLE_DUMMY_BUFFER) += iio_simple_dummy_buffer.o obj-$(CONFIG_IIO_DUMMY_EVGEN) += iio_dummy_evgen.o obj-$(CONFIG_IIO_ST_HWMON) += iio_hwmon.o +obj-$(CONFIG_IIO_ST_INPUT) += iio_input.o obj-y += accel/ obj-y += adc/
drivers/staging/iio/iio_input.c new file +221 -0
221 lines not on this page · raw message
drivers/staging/iio/iio_input.h new file +23 -0
@@ -0,0 +1,23 @@ +/* +* The industrial I/O input client driver +* +* Copyright (c) 2011 Jonathan Cameron +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 2 as published by +* the Free Software Foundation. +*/ + +/** +* iio_input_channel_data - description of the channel for input subsystem +* @code: Absolute axis. +* @min: Minimum value. +* @max: Maximum value. +* @fuzz: Used to filter noise from the event stream. +* @flat: Values within this value will be discarded by joydev +* and reported as 0 instead. +*/ +struct iio_input_channel_data { +unsigned int code; +int min, max, fuzz, flat; +};
Signature · 1 line
1.7.11.1