iio:gyro: device settings are set immediately during probe

This patch set gyro settings right after probe start. This is
done in preparation of regmap that needs different configuration
based on multiread bit value.

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
index f2a8683..fa71e94 100644 (file)
--- a/drivers/iio/gyro/st_gyro_i2c.c
+++ b/drivers/iio/gyro/st_gyro_i2c.c
@@ -63,19 +63,29 @@ MODULE_DEVICE_TABLE(of, st_gyro_of_match);
 #endif
 
 static int st_gyro_i2c_probe(struct i2c_client *client,
-                                               const struct i2c_device_id *id)
+                            const struct i2c_device_id *id)
 {
-       struct iio_dev *indio_dev;
+       const struct st_sensor_settings *settings;
        struct st_sensor_data *gdata;
+       struct iio_dev *indio_dev;
        int err;
 
+       st_sensors_of_name_probe(&client->dev, st_gyro_of_match,
+                                client->name, sizeof(client->name));
+
+       settings = st_gyro_get_settings(client->name);
+       if (!settings) {
+               dev_err(&client->dev, "device name %s not recognized.\n",
+                       client->name);
+               return -ENODEV;
+       }
+
        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*gdata));
        if (!indio_dev)
                return -ENOMEM;
 
        gdata = iio_priv(indio_dev);
-       st_sensors_of_name_probe(&client->dev, st_gyro_of_match,
-                                client->name, sizeof(client->name));
+       gdata->sensor_settings = (struct st_sensor_settings *)settings;
 
        st_sensors_i2c_configure(indio_dev, client, gdata);
 

diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c
index 93c4824..bb70820 100644 (file)
--- a/drivers/iio/gyro/st_gyro_spi.c
+++ b/drivers/iio/gyro/st_gyro_spi.c
@@ -69,18 +69,28 @@ MODULE_DEVICE_TABLE(of, st_gyro_of_match);
 
 static int st_gyro_spi_probe(struct spi_device *spi)
 {
-       struct iio_dev *indio_dev;
+       const struct st_sensor_settings *settings;
        struct st_sensor_data *gdata;
+       struct iio_dev *indio_dev;
        int err;
 
+       st_sensors_of_name_probe(&spi->dev, st_gyro_of_match,
+                                spi->modalias, sizeof(spi->modalias));
+
+       settings = st_gyro_get_settings(spi->modalias);
+       if (!settings) {
+               dev_err(&spi->dev, "device name %s not recognized.\n",
+                       spi->modalias);
+               return -ENODEV;
+       }
+
        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*gdata));
        if (!indio_dev)
                return -ENOMEM;
 
        gdata = iio_priv(indio_dev);
+       gdata->sensor_settings = (struct st_sensor_settings *)settings;
 
-       st_sensors_of_name_probe(&spi->dev, st_gyro_of_match,
-                                spi->modalias, sizeof(spi->modalias));
        st_sensors_spi_configure(indio_dev, spi, gdata);
 
        err = st_gyro_common_probe(indio_dev);