iio:magn: device settings are set immediately during probe
authorDenis Ciocca <denis.ciocca@st.com>
Thu, 18 Jul 2019 22:53:50 +0000 (15:53 -0700)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 27 Jul 2019 21:52:05 +0000 (22:52 +0100)
This patch set magn 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>
drivers/iio/magnetometer/st_magn_i2c.c
drivers/iio/magnetometer/st_magn_spi.c

index 4d014fd1aeb07f0cebdc6686ab65cb742e0dc00a..d5d565639bed185f540d740ddf941130edc4c259 100644 (file)
@@ -55,19 +55,29 @@ MODULE_DEVICE_TABLE(of, st_magn_of_match);
 #endif
 
 static int st_magn_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 *mdata;
+       struct iio_dev *indio_dev;
        int err;
 
+       st_sensors_of_name_probe(&client->dev, st_magn_of_match,
+                                client->name, sizeof(client->name));
+
+       settings = st_magn_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(*mdata));
        if (!indio_dev)
                return -ENOMEM;
 
        mdata = iio_priv(indio_dev);
-       st_sensors_of_name_probe(&client->dev, st_magn_of_match,
-                                client->name, sizeof(client->name));
+       mdata->sensor_settings = (struct st_sensor_settings *)settings;
 
        st_sensors_i2c_configure(indio_dev, client, mdata);
 
index 0d47070611b187ab5ed6e20322c41491502976d0..a3045afc6b531407b141d533aeecb4aa4bfe8a9c 100644 (file)
@@ -51,18 +51,28 @@ MODULE_DEVICE_TABLE(of, st_magn_of_match);
 
 static int st_magn_spi_probe(struct spi_device *spi)
 {
-       struct iio_dev *indio_dev;
+       const struct st_sensor_settings *settings;
        struct st_sensor_data *mdata;
+       struct iio_dev *indio_dev;
        int err;
 
+       st_sensors_of_name_probe(&spi->dev, st_magn_of_match,
+                                spi->modalias, sizeof(spi->modalias));
+
+       settings = st_magn_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(*mdata));
        if (!indio_dev)
                return -ENOMEM;
 
        mdata = iio_priv(indio_dev);
+       mdata->sensor_settings = (struct st_sensor_settings *)settings;
 
-       st_sensors_of_name_probe(&spi->dev, st_magn_of_match,
-                                spi->modalias, sizeof(spi->modalias));
        st_sensors_spi_configure(indio_dev, spi, mdata);
 
        err = st_magn_common_probe(indio_dev);