meta-egvirt/recipes-kernel/linux/linux-yocto/iio-scmi/0003-iio-scmi-Add-reading-raw-attribute.patch

   1 From 642e7a22d9f9e7c02869e1689d513dd84d118388 Mon Sep 17 00:00:00 2001
   2 From: Andriy Tryshnivskyy <andriy.tryshnivskyy@opensynergy.com>
   3 Date: Mon, 25 Oct 2021 13:41:18 +0300
   4 Subject: [PATCH] iio/scmi: Add reading "raw" attribute.
   5
   6 Add IIO_CHAN_INFO_RAW to the mask and implement corresponding
   7 reading "raw" attribute in scmi_iio_read_raw.
   8
   9 Signed-off-by: Andriy Tryshnivskyy <andriy.tryshnivskyy@opensynergy.com>
  10 ---
  11  drivers/iio/common/scmi_sensors/scmi_iio.c | 57 +++++++++++++++++++++-
  12  1 file changed, 56 insertions(+), 1 deletion(-)
  13
  14 diff --git a/drivers/iio/common/scmi_sensors/scmi_iio.c b/drivers/iio/common/scmi_sensors/scmi_iio.c
  15 index 31977c3bc600..53b3242f0f19 100644
  16 --- a/drivers/iio/common/scmi_sensors/scmi_iio.c
  17 +++ b/drivers/iio/common/scmi_sensors/scmi_iio.c
  18 @@ -296,6 +296,52 @@ static int scmi_iio_get_odr_val(struct iio_dev *iio_dev, int *val, int *val2)
  19         return 0;
  20  }
  21
  22 +static int scmi_iio_read_channel_data(struct iio_dev *iio_dev,
  23 +                            struct iio_chan_spec const *ch, int *val, int *val2)
  24 +{
  25 +       struct scmi_iio_priv *sensor = iio_priv(iio_dev);
  26 +       u32 sensor_config;
  27 +       struct scmi_sensor_reading readings[SCMI_IIO_NUM_OF_AXIS];
  28 +       int err;
  29 +
  30 +       sensor_config = FIELD_PREP(SCMI_SENS_CFG_SENSOR_ENABLED_MASK,
  31 +                                       SCMI_SENS_CFG_SENSOR_ENABLE);
  32 +       err = sensor->handle->sensor_ops->config_set(
  33 +               sensor->handle, sensor->sensor_info->id, sensor_config);
  34 +       if (err) {
  35 +               dev_err(&iio_dev->dev,
  36 +                       "Error in enabling sensor %s err %d",
  37 +                       sensor->sensor_info->name, err);
  38 +               return err;
  39 +       }
  40 +
  41 +       err = sensor->handle->sensor_ops->reading_get_timestamped(
  42 +               sensor->handle, sensor->sensor_info->id,
  43 +               sensor->sensor_info->num_axis, readings);
  44 +       if (err) {
  45 +               dev_err(&iio_dev->dev,
  46 +                       "Error in reading raw attribute for sensor %s err %d",
  47 +                       sensor->sensor_info->name, err);
  48 +               return err;
  49 +       }
  50 +
  51 +       sensor_config = FIELD_PREP(SCMI_SENS_CFG_SENSOR_ENABLED_MASK,
  52 +                                       SCMI_SENS_CFG_SENSOR_DISABLE);
  53 +       err = sensor->handle->sensor_ops->config_set(
  54 +               sensor->handle, sensor->sensor_info->id, sensor_config);
  55 +       if (err) {
  56 +               dev_err(&iio_dev->dev,
  57 +                       "Error in disabling sensor %s err %d",
  58 +                       sensor->sensor_info->name, err);
  59 +               return err;
  60 +       }
  61 +
  62 +       *val = lower_32_bits(readings[ch->scan_index].value);
  63 +       *val2 = upper_32_bits(readings[ch->scan_index].value);
  64 +
  65 +       return IIO_VAL_INT_64;
  66 +}
  67 +
  68  static int scmi_iio_read_raw(struct iio_dev *iio_dev,
  69                              struct iio_chan_spec const *ch, int *val,
  70                              int *val2, long mask)
  71 @@ -317,6 +363,14 @@ static int scmi_iio_read_raw(struct iio_dev *iio_dev,
  72         case IIO_CHAN_INFO_SAMP_FREQ:
  73                 ret = scmi_iio_get_odr_val(iio_dev, val, val2);
  74                 return ret ? ret : IIO_VAL_INT_PLUS_MICRO;
  75 +       case IIO_CHAN_INFO_RAW:
  76 +               ret = iio_device_claim_direct_mode(iio_dev);
  77 +               if (ret)
  78 +                       return ret;
  79 +
  80 +               ret = scmi_iio_read_channel_data(iio_dev, ch, val, val2);
  81 +               iio_device_release_direct_mode(iio_dev);
  82 +               return ret;
  83         default:
  84                 return -EINVAL;
  85         }
  86 @@ -398,7 +452,8 @@ static void scmi_iio_set_data_channel(struct iio_chan_spec *iio_chan,
  87         iio_chan->type = type;
  88         iio_chan->modified = 1;
  89         iio_chan->channel2 = mod;
  90 -       iio_chan->info_mask_separate = BIT(IIO_CHAN_INFO_SCALE);
  91 +       iio_chan->info_mask_separate =
  92 +               BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_RAW);
  93         iio_chan->info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SAMP_FREQ);
  94         iio_chan->info_mask_shared_by_type_available =
  95                 BIT(IIO_CHAN_INFO_SAMP_FREQ);
  96 --
  97 2.17.1
  98