On Thu, 18 Jul 2019 15:53:50 -0700
Denis Ciocca <denis.ciocca@xxxxxx> wrote:
> 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@xxxxxx>
Applied,
Thanks,
> ---
> Changes in v2:
> not there in v1.
>
> drivers/iio/magnetometer/st_magn_i2c.c | 18 ++++++++++++++----
> drivers/iio/magnetometer/st_magn_spi.c | 16 +++++++++++++---
> 2 files changed, 27 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
> index 4d014fd1aeb0..d5d565639bed 100644
> --- a/drivers/iio/magnetometer/st_magn_i2c.c
> +++ b/drivers/iio/magnetometer/st_magn_i2c.c
> @@ -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);
>
> diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
> index 0d47070611b1..a3045afc6b53 100644
> --- a/drivers/iio/magnetometer/st_magn_spi.c
> +++ b/drivers/iio/magnetometer/st_magn_spi.c
> @@ -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);
