target/linux/generic/backport-4.19/499-v4.22-iio-add-IIO_MASSCONCENTRATION-channel-type.patch

   1 From 17abc9ec68b73ddeb262a507a62421016b9c54d5 Mon Sep 17 00:00:00 2001
   2 From: Tomasz Duszynski <tduszyns@gmail.com>
   3 Date: Fri, 14 Dec 2018 19:28:01 +0100
   4 Subject: [PATCH] iio: add IIO_MASSCONCENTRATION channel type
   5
   6 Measuring particulate matter in ug / m3 (micro-grams per cubic meter)
   7 is de facto standard. Existing air quality sensors usually follow
   8 this convention and are capable of returning measurements using
   9 this unit.
  10
  11 IIO currently does not offer suitable channel type for this
  12 type of measurements hence this patch adds this.
  13
  14 In addition, extra modifiers are introduced used for distinguishing
  15 between fine pm1, pm2p5 and coarse pm4, pm10 particle measurements, i.e
  16 IIO_MOD_PM1, IIO_MOD_PM25 and IIO_MOD_PM4, IIO_MOD_PM10.
  17
  18 pmX consists of particles with aerodynamic diameter less or equal to
  19 X micrometers.
  20
  21 Signed-off-by: Tomasz Duszynski <tduszyns@gmail.com>
  22 Acked-by: Matt Ranostay <matt.ranostay@konsulko.com>
  23 Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
  24 ---
  25  Documentation/ABI/testing/sysfs-bus-iio | 17 ++++++++++++++++-
  26  drivers/iio/industrialio-core.c         |  5 +++++
  27  include/uapi/linux/iio/types.h          |  5 +++++
  28  tools/iio/iio_event_monitor.c           | 10 ++++++++++
  29  4 files changed, 36 insertions(+), 1 deletion(-)
  30
  31 --- a/Documentation/ABI/testing/sysfs-bus-iio
  32 +++ b/Documentation/ABI/testing/sysfs-bus-iio
  33 @@ -1684,4 +1684,19 @@ KernelVersion:   4.18
  34  Contact:       linux-iio@vger.kernel.org
  35  Description:
  36                 Raw (unscaled) phase difference reading from channel Y
  37 -               that can be processed to radians.
  38 \ No newline at end of file
  39 +               that can be processed to radians.
  40 +
  41 +What:          /sys/bus/iio/devices/iio:deviceX/in_massconcentration_pm1_input
  42 +What:          /sys/bus/iio/devices/iio:deviceX/in_massconcentrationY_pm1_input
  43 +What:          /sys/bus/iio/devices/iio:deviceX/in_massconcentration_pm2p5_input
  44 +What:          /sys/bus/iio/devices/iio:deviceX/in_massconcentrationY_pm2p5_input
  45 +What:          /sys/bus/iio/devices/iio:deviceX/in_massconcentration_pm4_input
  46 +What:          /sys/bus/iio/devices/iio:deviceX/in_massconcentrationY_pm4_input
  47 +What:          /sys/bus/iio/devices/iio:deviceX/in_massconcentration_pm10_input
  48 +What:          /sys/bus/iio/devices/iio:deviceX/in_massconcentrationY_pm10_input
  49 +KernelVersion: 4.22
  50 +Contact:       linux-iio@vger.kernel.org
  51 +Description:
  52 +               Mass concentration reading of particulate matter in ug / m3.
  53 +               pmX consists of particles with aerodynamic diameter less or
  54 +               equal to X micrometers.
  55 --- a/drivers/iio/industrialio-core.c
  56 +++ b/drivers/iio/industrialio-core.c
  57 @@ -87,6 +87,7 @@ static const char * const iio_chan_type_
  58         [IIO_GRAVITY]  = "gravity",
  59         [IIO_POSITIONRELATIVE]  = "positionrelative",
  60         [IIO_PHASE] = "phase",
  61 +       [IIO_MASSCONCENTRATION] = "massconcentration",
  62  };
  63
  64  static const char * const iio_modifier_names[] = {
  65 @@ -127,6 +128,10 @@ static const char * const iio_modifier_n
  66         [IIO_MOD_Q] = "q",
  67         [IIO_MOD_CO2] = "co2",
  68         [IIO_MOD_VOC] = "voc",
  69 +       [IIO_MOD_PM1] = "pm1",
  70 +       [IIO_MOD_PM2P5] = "pm2p5",
  71 +       [IIO_MOD_PM4] = "pm4",
  72 +       [IIO_MOD_PM10] = "pm10",
  73  };
  74
  75  /* relies on pairs of these shared then separate */
  76 --- a/include/uapi/linux/iio/types.h
  77 +++ b/include/uapi/linux/iio/types.h
  78 @@ -46,6 +46,7 @@ enum iio_chan_type {
  79         IIO_GRAVITY,
  80         IIO_POSITIONRELATIVE,
  81         IIO_PHASE,
  82 +       IIO_MASSCONCENTRATION,
  83  };
  84
  85  enum iio_modifier {
  86 @@ -87,6 +88,10 @@ enum iio_modifier {
  87         IIO_MOD_VOC,
  88         IIO_MOD_LIGHT_UV,
  89         IIO_MOD_LIGHT_DUV,
  90 +       IIO_MOD_PM1,
  91 +       IIO_MOD_PM2P5,
  92 +       IIO_MOD_PM4,
  93 +       IIO_MOD_PM10,
  94  };
  95
  96  enum iio_event_type {
  97 --- a/tools/iio/iio_event_monitor.c
  98 +++ b/tools/iio/iio_event_monitor.c
  99 @@ -60,6 +60,7 @@ static const char * const iio_chan_type_
 100         [IIO_GRAVITY] = "gravity",
 101         [IIO_POSITIONRELATIVE] = "positionrelative",
 102         [IIO_PHASE] = "phase",
 103 +       [IIO_MASSCONCENTRATION] = "massconcentration",
 104  };
 105
 106  static const char * const iio_ev_type_text[] = {
 107 @@ -115,6 +116,10 @@ static const char * const iio_modifier_n
 108         [IIO_MOD_Q] = "q",
 109         [IIO_MOD_CO2] = "co2",
 110         [IIO_MOD_VOC] = "voc",
 111 +       [IIO_MOD_PM1] = "pm1",
 112 +       [IIO_MOD_PM2P5] = "pm2p5",
 113 +       [IIO_MOD_PM4] = "pm4",
 114 +       [IIO_MOD_PM10] = "pm10",
 115  };
 116
 117  static bool event_is_known(struct iio_event_data *event)
 118 @@ -156,6 +161,7 @@ static bool event_is_known(struct iio_ev
 119         case IIO_GRAVITY:
 120         case IIO_POSITIONRELATIVE:
 121         case IIO_PHASE:
 122 +       case IIO_MASSCONCENTRATION:
 123                 break;
 124         default:
 125                 return false;
 126 @@ -200,6 +206,10 @@ static bool event_is_known(struct iio_ev
 127         case IIO_MOD_Q:
 128         case IIO_MOD_CO2:
 129         case IIO_MOD_VOC:
 130 +       case IIO_MOD_PM1:
 131 +       case IIO_MOD_PM2P5:
 132 +       case IIO_MOD_PM4:
 133 +       case IIO_MOD_PM10:
 134                 break;
 135         default:
 136                 return false;