a2c17c93b7
[ Upstream commit 9f0b3e0cc0c88618aa9e5cecef747b1337ae0a5d ] Up until commitea7e586bdd("iio: st_sensors: move regulator retrieveal to core") only the ST pressure driver seems to have had any regulator disable. After that commit, the regulator handling was moved into the common st_sensors logic. In all instances of this regulator handling, the regulators were disabled before unregistering the IIO device. This can cause issues where the device would be powered down and still be available to userspace, allowing it to send invalid/garbage data. This change moves the st_sensors_power_disable() after the common probe functions. These common probe functions also handle unregistering the IIO device. Fixes:774487611c("iio: pressure-core: st: Provide support for the Vdd power supply") Fixes:ea7e586bdd("iio: st_sensors: move regulator retrieveal to core") Cc: Lee Jones <lee.jones@linaro.org> Cc: Denis CIOCCA <denis.ciocca@st.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com> Link: https://lore.kernel.org/r/20210823112204.243255-2-aardelean@deviqon.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
148 lines
3.2 KiB
C
148 lines
3.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* STMicroelectronics gyroscopes driver
|
|
*
|
|
* Copyright 2012-2013 STMicroelectronics Inc.
|
|
*
|
|
* Denis Ciocca <denis.ciocca@st.com>
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/iio/iio.h>
|
|
|
|
#include <linux/iio/common/st_sensors.h>
|
|
#include <linux/iio/common/st_sensors_spi.h>
|
|
#include "st_gyro.h"
|
|
|
|
/*
|
|
* For new single-chip sensors use <device_name> as compatible string.
|
|
* For old single-chip devices keep <device_name>-gyro to maintain
|
|
* compatibility
|
|
*/
|
|
static const struct of_device_id st_gyro_of_match[] = {
|
|
{
|
|
.compatible = "st,l3g4200d-gyro",
|
|
.data = L3G4200D_GYRO_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lsm330d-gyro",
|
|
.data = LSM330D_GYRO_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lsm330dl-gyro",
|
|
.data = LSM330DL_GYRO_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lsm330dlc-gyro",
|
|
.data = LSM330DLC_GYRO_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,l3gd20-gyro",
|
|
.data = L3GD20_GYRO_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,l3gd20h-gyro",
|
|
.data = L3GD20H_GYRO_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,l3g4is-gyro",
|
|
.data = L3G4IS_GYRO_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lsm330-gyro",
|
|
.data = LSM330_GYRO_DEV_NAME,
|
|
},
|
|
{
|
|
.compatible = "st,lsm9ds0-gyro",
|
|
.data = LSM9DS0_GYRO_DEV_NAME,
|
|
},
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(of, st_gyro_of_match);
|
|
|
|
static int st_gyro_spi_probe(struct spi_device *spi)
|
|
{
|
|
const struct st_sensor_settings *settings;
|
|
struct st_sensor_data *gdata;
|
|
struct iio_dev *indio_dev;
|
|
int err;
|
|
|
|
st_sensors_dev_name_probe(&spi->dev, 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;
|
|
|
|
err = st_sensors_spi_configure(indio_dev, spi);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
err = st_sensors_power_enable(indio_dev);
|
|
if (err)
|
|
return err;
|
|
|
|
err = st_gyro_common_probe(indio_dev);
|
|
if (err < 0)
|
|
goto st_gyro_power_off;
|
|
|
|
return 0;
|
|
|
|
st_gyro_power_off:
|
|
st_sensors_power_disable(indio_dev);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int st_gyro_spi_remove(struct spi_device *spi)
|
|
{
|
|
struct iio_dev *indio_dev = spi_get_drvdata(spi);
|
|
|
|
st_gyro_common_remove(indio_dev);
|
|
|
|
st_sensors_power_disable(indio_dev);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct spi_device_id st_gyro_id_table[] = {
|
|
{ L3G4200D_GYRO_DEV_NAME },
|
|
{ LSM330D_GYRO_DEV_NAME },
|
|
{ LSM330DL_GYRO_DEV_NAME },
|
|
{ LSM330DLC_GYRO_DEV_NAME },
|
|
{ L3GD20_GYRO_DEV_NAME },
|
|
{ L3GD20H_GYRO_DEV_NAME },
|
|
{ L3G4IS_GYRO_DEV_NAME },
|
|
{ LSM330_GYRO_DEV_NAME },
|
|
{ LSM9DS0_GYRO_DEV_NAME },
|
|
{},
|
|
};
|
|
MODULE_DEVICE_TABLE(spi, st_gyro_id_table);
|
|
|
|
static struct spi_driver st_gyro_driver = {
|
|
.driver = {
|
|
.name = "st-gyro-spi",
|
|
.of_match_table = st_gyro_of_match,
|
|
},
|
|
.probe = st_gyro_spi_probe,
|
|
.remove = st_gyro_spi_remove,
|
|
.id_table = st_gyro_id_table,
|
|
};
|
|
module_spi_driver(st_gyro_driver);
|
|
|
|
MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>");
|
|
MODULE_DESCRIPTION("STMicroelectronics gyroscopes spi driver");
|
|
MODULE_LICENSE("GPL v2");
|