meta-agl-bsp/virtualization-layer/recipes-kernel/linux/linux-yocto/virtio-kmeta/bsp/virtio/virtio-scmi/0002-iio-scmi-Add-reading-raw-attribute.patch

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