Commit feba6b18 authored by Denis Ciocca's avatar Denis Ciocca Committed by Jonathan Cameron
Browse files

iio:accel: device settings are set immediately during probe 



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

Signed-off-by: default avatarDenis Ciocca <denis.ciocca@st.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 539b25fa

drivers/iio/accel/st_accel_i2c.c

+14 −5
Original line number Diff line number Diff line
@@ -150,20 +150,29 @@ MODULE_DEVICE_TABLE(i2c, st_accel_id_table); 


static int st_accel_i2c_probe(struct i2c_client *client)

{

	struct iio_dev *indio_dev;

	const struct st_sensor_settings *settings;

	struct st_sensor_data *adata;

	struct iio_dev *indio_dev;

	const char *match;

	int ret;



	match = device_get_match_data(&client->dev);

	if (match)

		strlcpy(client->name, match, sizeof(client->name));



	settings = st_accel_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(*adata));

	if (!indio_dev)

		return -ENOMEM;



	adata = iio_priv(indio_dev);



	match = device_get_match_data(&client->dev);

	if (match)

		strlcpy(client->name, match, sizeof(client->name));

	adata->sensor_settings = (struct st_sensor_settings *)settings;



	st_sensors_i2c_configure(indio_dev, client, adata);

drivers/iio/accel/st_accel_spi.c

+13 −3
Original line number Diff line number Diff line
@@ -102,18 +102,28 @@ MODULE_DEVICE_TABLE(of, st_accel_of_match); 


static int st_accel_spi_probe(struct spi_device *spi)

{

	struct iio_dev *indio_dev;

	const struct st_sensor_settings *settings;

	struct st_sensor_data *adata;

	struct iio_dev *indio_dev;

	int err;



	st_sensors_of_name_probe(&spi->dev, st_accel_of_match,

				 spi->modalias, sizeof(spi->modalias));



	settings = st_accel_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(*adata));

	if (!indio_dev)

		return -ENOMEM;



	adata = iio_priv(indio_dev);

	adata->sensor_settings = (struct st_sensor_settings *)settings;



	st_sensors_of_name_probe(&spi->dev, st_accel_of_match,

				 spi->modalias, sizeof(spi->modalias));

	st_sensors_spi_configure(indio_dev, spi, adata);



	err = st_accel_common_probe(indio_dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE