p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iio:pressure: device settings are set immediately during probe 

This patch set pressure 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>
This commit is contained in:
Denis Ciocca 2019-07-18 15:53:51 -07:00 committed by Jonathan Cameron
parent 291d83f2f4
commit 570c2c55ef
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/iio/pressure/st_pressure_i2c.c
View File

@ -78,18 +78,13 @@ static const struct i2c_device_id st_press_id_table[] = {
MODULE_DEVICE_TABLE(i2c, st_press_id_table); MODULE_DEVICE_TABLE(i2c, st_press_id_table);
static int st_press_i2c_probe(struct i2c_client *client, static int st_press_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 *press_data; struct st_sensor_data *press_data;
struct iio_dev *indio_dev;
int ret; int ret;
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*press_data));
if (!indio_dev)
return -ENOMEM;
press_data = iio_priv(indio_dev);
if (client->dev.of_node) { if (client->dev.of_node) {
st_sensors_of_name_probe(&client->dev, st_press_of_match, st_sensors_of_name_probe(&client->dev, st_press_of_match,
client->name, sizeof(client->name)); client->name, sizeof(client->name));
@ -99,10 +94,24 @@ static int st_press_i2c_probe(struct i2c_client *client,
return -ENODEV; return -ENODEV;
strlcpy(client->name, st_press_id_table[ret].name, strlcpy(client->name, st_press_id_table[ret].name,
sizeof(client->name)); sizeof(client->name));
} else if (!id) } else if (!id)
return -ENODEV; return -ENODEV;
settings = st_press_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(*press_data));
if (!indio_dev)
return -ENOMEM;
press_data = iio_priv(indio_dev);
press_data->sensor_settings = (struct st_sensor_settings *)settings;
st_sensors_i2c_configure(indio_dev, client, press_data); st_sensors_i2c_configure(indio_dev, client, press_data);
ret = st_press_common_probe(indio_dev); ret = st_press_common_probe(indio_dev);

24
drivers/iio/pressure/st_pressure_spi.c
View File

@ -61,18 +61,28 @@ MODULE_DEVICE_TABLE(of, st_press_of_match);
static int st_press_spi_probe(struct spi_device *spi) static int st_press_spi_probe(struct spi_device *spi)
{ {
struct iio_dev *indio_dev; const struct st_sensor_settings *settings;
struct st_sensor_data *press_data; struct st_sensor_data *press_data;
struct iio_dev *indio_dev;
int err; int err;
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*press_data));
if (indio_dev == NULL)
return -ENOMEM;
press_data = iio_priv(indio_dev);
st_sensors_of_name_probe(&spi->dev, st_press_of_match, st_sensors_of_name_probe(&spi->dev, st_press_of_match,
spi->modalias, sizeof(spi->modalias)); spi->modalias, sizeof(spi->modalias));
settings = st_press_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(*press_data));
if (!indio_dev)
return -ENOMEM;
press_data = iio_priv(indio_dev);
press_data->sensor_settings = (struct st_sensor_settings *)settings;
st_sensors_spi_configure(indio_dev, spi, press_data); st_sensors_spi_configure(indio_dev, spi, press_data);
err = st_press_common_probe(indio_dev); err = st_press_common_probe(indio_dev);