diff options
author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-24 13:39:25 +0100 |
---|---|---|
committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-24 13:39:25 +0100 |
commit | 431dffc1df07b93ce9be26d264b7946cd65cb949 (patch) | |
tree | f8aaf7d46c8d90f5b2ebe0d6af6f8991b658ea0b /drivers/iio/industrialio-core.c | |
parent | 57d3909596f9941c7d0777004994438df1b5ba0a (diff) | |
parent | c6c97210e27237438689611980f8a7b87bcc79bf (diff) |
Merge branch 'ib-iio-hid-sensors-v6.6-rc1' into togreg
The deta angle and deta velocity channels were added in parallel with
color temperature and chromacity so this merge had to assign a
consistent order. I put the color related ones second.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio/industrialio-core.c')
-rw-r--r-- | drivers/iio/industrialio-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 2ea0bf08caf3..c77745b594bd 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -92,6 +92,8 @@ static const char * const iio_chan_type_name_spec[] = { [IIO_MASSCONCENTRATION] = "massconcentration", [IIO_DELTA_ANGL] = "deltaangl", [IIO_DELTA_VELOCITY] = "deltavelocity", + [IIO_COLORTEMP] = "colortemp", + [IIO_CHROMATICITY] = "chromaticity", }; static const char * const iio_modifier_names[] = { |