From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Date: Sun, 24 Sep 2023 12:39:25 +0000 (+0100)
Subject: Merge branch 'ib-iio-hid-sensors-v6.6-rc1' into togreg
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=431dffc1df07b93ce9be26d264b7946cd65cb949;p=users%2Fwilly%2Fxarray.git

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>
---

431dffc1df07b93ce9be26d264b7946cd65cb949
diff --cc drivers/iio/industrialio-core.c
index 2ea0bf08caf3,6dc4d2b296bb..c77745b594bd
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@@ -90,8 -90,8 +90,10 @@@ static const char * const iio_chan_type
  	[IIO_POSITIONRELATIVE]  = "positionrelative",
  	[IIO_PHASE] = "phase",
  	[IIO_MASSCONCENTRATION] = "massconcentration",
 +	[IIO_DELTA_ANGL] = "deltaangl",
 +	[IIO_DELTA_VELOCITY] = "deltavelocity",
+ 	[IIO_COLORTEMP] = "colortemp",
+ 	[IIO_CHROMATICITY] = "chromaticity",
  };
  
  static const char * const iio_modifier_names[] = {
diff --cc include/uapi/linux/iio/types.h
index 9a341bd07702,4832c611c027..9c2ffdcd6623
--- a/include/uapi/linux/iio/types.h
+++ b/include/uapi/linux/iio/types.h
@@@ -47,8 -47,8 +47,10 @@@ enum iio_chan_type 
  	IIO_POSITIONRELATIVE,
  	IIO_PHASE,
  	IIO_MASSCONCENTRATION,
 +	IIO_DELTA_ANGL,
 +	IIO_DELTA_VELOCITY,
+ 	IIO_COLORTEMP,
+ 	IIO_CHROMATICITY,
  };
  
  enum iio_modifier {
diff --cc tools/iio/iio_event_monitor.c
index 7e6761612246,a28a86f2bd5b..2eaaa7123b04
--- a/tools/iio/iio_event_monitor.c
+++ b/tools/iio/iio_event_monitor.c
@@@ -59,8 -59,8 +59,10 @@@ static const char * const iio_chan_type
  	[IIO_POSITIONRELATIVE] = "positionrelative",
  	[IIO_PHASE] = "phase",
  	[IIO_MASSCONCENTRATION] = "massconcentration",
 +	[IIO_DELTA_ANGL] = "deltaangl",
 +	[IIO_DELTA_VELOCITY] = "deltavelocity",
+ 	[IIO_COLORTEMP] = "colortemp",
+ 	[IIO_CHROMATICITY] = "chromaticity",
  };
  
  static const char * const iio_ev_type_text[] = {
@@@ -175,8 -175,8 +177,10 @@@ static bool event_is_known(struct iio_e
  	case IIO_POSITIONRELATIVE:
  	case IIO_PHASE:
  	case IIO_MASSCONCENTRATION:
 +	case IIO_DELTA_ANGL:
 +	case IIO_DELTA_VELOCITY:
+ 	case IIO_COLORTEMP:
+ 	case IIO_CHROMATICITY:
  		break;
  	default:
  		return false;