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>

diff --cc Documentation/ABI/testing/sysfs-bus-iio
Simple merge

diff --cc drivers/iio/industrialio-core.c
index 2ea0bf08caf39b83a1ceff7cc0379d8482280ec3,6dc4d2b296bba5350343d127c2674c70834bf59a..c77745b594bd6ecddfd483d255a308efc2c5cd1c
--- 1/drivers/iio/industrialio-core.c
--- 2/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 drivers/iio/light/hid-sensor-als.c
Simple merge

diff --cc include/uapi/linux/iio/types.h
index 9a341bd0770234e5d13a987e07a623c78324131b,4832c611c027f783a5de88c36243e075157262d8..9c2ffdcd66230055eda531a6b25cbd2513830f7f
--- 1/include/uapi/linux/iio/types.h
--- 2/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 7e6761612246ebb1db9345486a5c29438885cfd9,a28a86f2bd5b358017f998d02ab3ab9d1293d56e..2eaaa7123b042b04dc9acb17d8eab53f704e773f
--- 1/tools/iio/iio_event_monitor.c
--- 2/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;