diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-24 15:39:25 +0300 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-24 15:39:25 +0300 |
| commit | 431dffc1df07b93ce9be26d264b7946cd65cb949 (patch) | |
| tree | f8aaf7d46c8d90f5b2ebe0d6af6f8991b658ea0b /include | |
| parent | 57d3909596f9941c7d0777004994438df1b5ba0a (diff) | |
| parent | c6c97210e27237438689611980f8a7b87bcc79bf (diff) | |
| download | linux-431dffc1df07b93ce9be26d264b7946cd65cb949.tar.xz | |
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 'include')
| -rw-r--r-- | include/linux/hid-sensor-ids.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/iio/types.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h index 13b1e65fbdcc..6730ee900ee1 100644 --- a/include/linux/hid-sensor-ids.h +++ b/include/linux/hid-sensor-ids.h @@ -21,6 +21,10 @@ #define HID_USAGE_SENSOR_ALS 0x200041 #define HID_USAGE_SENSOR_DATA_LIGHT 0x2004d0 #define HID_USAGE_SENSOR_LIGHT_ILLUM 0x2004d1 +#define HID_USAGE_SENSOR_LIGHT_COLOR_TEMPERATURE 0x2004d2 +#define HID_USAGE_SENSOR_LIGHT_CHROMATICITY 0x2004d3 +#define HID_USAGE_SENSOR_LIGHT_CHROMATICITY_X 0x2004d4 +#define HID_USAGE_SENSOR_LIGHT_CHROMATICITY_Y 0x2004d5 /* PROX (200011) */ #define HID_USAGE_SENSOR_PROX 0x200011 diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h index 9a341bd07702..9c2ffdcd6623 100644 --- a/include/uapi/linux/iio/types.h +++ b/include/uapi/linux/iio/types.h @@ -49,6 +49,8 @@ enum iio_chan_type { IIO_MASSCONCENTRATION, IIO_DELTA_ANGL, IIO_DELTA_VELOCITY, + IIO_COLORTEMP, + IIO_CHROMATICITY, }; enum iio_modifier { |