diff --git a/[refs] b/[refs] index 5fa2d0242de1..18c5379b29fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e8fa5b8631a0965065d621240c0eafe879ac5d0 +refs/heads/master: eb7fea53e53ed47e82b4cc9911dd8fdc7f953de5 diff --git a/trunk/drivers/staging/iio/iio.h b/trunk/drivers/staging/iio/iio.h index c6b471cf3b42..1a6bedc01f4c 100644 --- a/trunk/drivers/staging/iio/iio.h +++ b/trunk/drivers/staging/iio/iio.h @@ -73,7 +73,11 @@ enum iio_chan_info_enum { IIO_CHAN_INFO_CALIBSCALE_SHARED, IIO_CHAN_INFO_CALIBSCALE_SEPARATE, IIO_CHAN_INFO_CALIBBIAS_SHARED, - IIO_CHAN_INFO_CALIBBIAS_SEPARATE + IIO_CHAN_INFO_CALIBBIAS_SEPARATE, + IIO_CHAN_INFO_PEAK_SHARED, + IIO_CHAN_INFO_PEAK_SEPARATE, + IIO_CHAN_INFO_PEAK_SCALE_SHARED, + IIO_CHAN_INFO_PEAK_SCALE_SEPARATE, }; /** diff --git a/trunk/drivers/staging/iio/industrialio-core.c b/trunk/drivers/staging/iio/industrialio-core.c index e943dacf8bfa..e3582c9e18c1 100644 --- a/trunk/drivers/staging/iio/industrialio-core.c +++ b/trunk/drivers/staging/iio/industrialio-core.c @@ -80,6 +80,8 @@ static const char * const iio_chan_info_postfix[] = { [IIO_CHAN_INFO_OFFSET_SHARED/2] = "offset", [IIO_CHAN_INFO_CALIBSCALE_SHARED/2] = "calibscale", [IIO_CHAN_INFO_CALIBBIAS_SHARED/2] = "calibbias", + [IIO_CHAN_INFO_PEAK_SHARED/2] = "peak_raw", + [IIO_CHAN_INFO_PEAK_SCALE_SHARED/2] = "peak_scale", }; int iio_push_event(struct iio_dev *dev_info,