Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc27381e authored by Giuseppe Barba's avatar Giuseppe Barba Committed by Jonathan Cameron
Browse files

iio: st-sensors: add configuration for WhoAmI address 



This patch permits to configure the WhoAmI register address
because some device could have not a standard address for
this register.

Signed-off-by: default avatarGiuseppe Barba <giuseppe.barba@st.com>
Reviewed-by: default avatarDenis Ciocca <denis.ciocca@st.com>
Acked-by: default avatarDenis Ciocca <denis.ciocca@st.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent c176becd

drivers/iio/accel/st_accel_core.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -226,6 +226,7 @@ static const struct iio_chan_spec st_accel_16bit_channels[] = { 
static const struct st_sensor_settings st_accel_sensors_settings[] = {

static const struct st_sensor_settings st_accel_sensors_settings[] = {

	{

	{

		.wai = ST_ACCEL_1_WAI_EXP,

		.wai = ST_ACCEL_1_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LIS3DH_ACCEL_DEV_NAME,

			[0] = LIS3DH_ACCEL_DEV_NAME,

			[1] = LSM303DLHC_ACCEL_DEV_NAME,

			[1] = LSM303DLHC_ACCEL_DEV_NAME,
@@ -297,6 +298,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
	},

	},

	{

	{

		.wai = ST_ACCEL_2_WAI_EXP,

		.wai = ST_ACCEL_2_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LIS331DLH_ACCEL_DEV_NAME,

			[0] = LIS331DLH_ACCEL_DEV_NAME,

			[1] = LSM303DL_ACCEL_DEV_NAME,

			[1] = LSM303DL_ACCEL_DEV_NAME,
@@ -359,6 +361,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
	},

	},

	{

	{

		.wai = ST_ACCEL_3_WAI_EXP,

		.wai = ST_ACCEL_3_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LSM330_ACCEL_DEV_NAME,

			[0] = LSM330_ACCEL_DEV_NAME,

		},

		},
@@ -437,6 +440,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
	},

	},

	{

	{

		.wai = ST_ACCEL_4_WAI_EXP,

		.wai = ST_ACCEL_4_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LIS3LV02DL_ACCEL_DEV_NAME,

			[0] = LIS3LV02DL_ACCEL_DEV_NAME,

		},

		},
@@ -494,6 +498,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
	},

	},

	{

	{

		.wai = ST_ACCEL_5_WAI_EXP,

		.wai = ST_ACCEL_5_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LIS331DL_ACCEL_DEV_NAME,

			[0] = LIS331DL_ACCEL_DEV_NAME,

		},

		},

drivers/iio/common/st_sensors/st_sensors_core.c

+23 −26
Original line number Original line Diff line number Diff line
@@ -479,46 +479,43 @@ int st_sensors_check_device_support(struct iio_dev *indio_dev, 
			int num_sensors_list,

			int num_sensors_list,

			const struct st_sensor_settings *sensor_settings)

			const struct st_sensor_settings *sensor_settings)

{

{

	u8 wai;

	int i, n, err;

	int i, n, err;

	u8 wai;

	struct st_sensor_data *sdata = iio_priv(indio_dev);

	struct st_sensor_data *sdata = iio_priv(indio_dev);





	err = sdata->tf->read_byte(&sdata->tb, sdata->dev,

					ST_SENSORS_DEFAULT_WAI_ADDRESS, &wai);

	if (err < 0) {

		dev_err(&indio_dev->dev, "failed to read Who-Am-I register.\n");

		goto read_wai_error;

	}



	for (i = 0; i < num_sensors_list; i++) {

	for (i = 0; i < num_sensors_list; i++) {

		if (sensor_settings[i].wai == wai)

		for (n = 0; n < ST_SENSORS_MAX_4WAI; n++) {

			if (strcmp(indio_dev->name,

				sensor_settings[i].sensors_supported[n]) == 0) {

				break;

				break;

			}

			}

	if (i == num_sensors_list)

		}

		goto device_not_supported;

		if (n < ST_SENSORS_MAX_4WAI)



	for (n = 0; n < ARRAY_SIZE(sensor_settings[i].sensors_supported); n++) {

		if (strcmp(indio_dev->name,

				&sensor_settings[i].sensors_supported[n][0]) == 0)

			break;

			break;

	}

	}

	if (n == ARRAY_SIZE(sensor_settings[i].sensors_supported)) {

	if (i == num_sensors_list) {

		dev_err(&indio_dev->dev, "device name \"%s\" and WhoAmI (0x%02x) mismatch",

		dev_err(&indio_dev->dev, "device name %s not recognized.\n",

							indio_dev->name);

		return -ENODEV;

	}



	err = sdata->tf->read_byte(&sdata->tb, sdata->dev,

					sensor_settings[i].wai_addr, &wai);

	if (err < 0) {

		dev_err(&indio_dev->dev, "failed to read Who-Am-I register.\n");

		return err;

	}



	if (sensor_settings[i].wai != wai) {

		dev_err(&indio_dev->dev, "%s: WhoAmI mismatch (0x%x).\n",

						indio_dev->name, wai);

						indio_dev->name, wai);

		goto sensor_name_mismatch;

		return -EINVAL;

	}

	}





	sdata->sensor_settings =

	sdata->sensor_settings =

			(struct st_sensor_settings *)&sensor_settings[i];

			(struct st_sensor_settings *)&sensor_settings[i];





	return i;

	return i;



device_not_supported:

	dev_err(&indio_dev->dev, "device not supported: WhoAmI (0x%x).\n", wai);

sensor_name_mismatch:

	err = -ENODEV;

read_wai_error:

	return err;

}

}

EXPORT_SYMBOL(st_sensors_check_device_support);

EXPORT_SYMBOL(st_sensors_check_device_support);

drivers/iio/gyro/st_gyro_core.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -131,6 +131,7 @@ static const struct iio_chan_spec st_gyro_16bit_channels[] = { 
static const struct st_sensor_settings st_gyro_sensors_settings[] = {

static const struct st_sensor_settings st_gyro_sensors_settings[] = {

	{

	{

		.wai = ST_GYRO_1_WAI_EXP,

		.wai = ST_GYRO_1_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = L3G4200D_GYRO_DEV_NAME,

			[0] = L3G4200D_GYRO_DEV_NAME,

			[1] = LSM330DL_GYRO_DEV_NAME,

			[1] = LSM330DL_GYRO_DEV_NAME,
@@ -190,6 +191,7 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = { 
	},

	},

	{

	{

		.wai = ST_GYRO_2_WAI_EXP,

		.wai = ST_GYRO_2_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = L3GD20_GYRO_DEV_NAME,

			[0] = L3GD20_GYRO_DEV_NAME,

			[1] = LSM330D_GYRO_DEV_NAME,

			[1] = LSM330D_GYRO_DEV_NAME,
@@ -252,6 +254,7 @@ static const struct st_sensor_settings st_gyro_sensors_settings[] = { 
	},

	},

	{

	{

		.wai = ST_GYRO_3_WAI_EXP,

		.wai = ST_GYRO_3_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = L3GD20_GYRO_DEV_NAME,

			[0] = L3GD20_GYRO_DEV_NAME,

		},

		},

drivers/iio/magnetometer/st_magn_core.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -192,6 +192,7 @@ static const struct iio_chan_spec st_magn_2_16bit_channels[] = { 
static const struct st_sensor_settings st_magn_sensors_settings[] = {

static const struct st_sensor_settings st_magn_sensors_settings[] = {

	{

	{

		.wai = 0, /* This sensor has no valid WhoAmI report 0 */

		.wai = 0, /* This sensor has no valid WhoAmI report 0 */

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LSM303DLH_MAGN_DEV_NAME,

			[0] = LSM303DLH_MAGN_DEV_NAME,

		},

		},
@@ -268,6 +269,7 @@ static const struct st_sensor_settings st_magn_sensors_settings[] = { 
	},

	},

	{

	{

		.wai = ST_MAGN_1_WAI_EXP,

		.wai = ST_MAGN_1_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LSM303DLHC_MAGN_DEV_NAME,

			[0] = LSM303DLHC_MAGN_DEV_NAME,

			[1] = LSM303DLM_MAGN_DEV_NAME,

			[1] = LSM303DLM_MAGN_DEV_NAME,
@@ -346,6 +348,7 @@ static const struct st_sensor_settings st_magn_sensors_settings[] = { 
	},

	},

	{

	{

		.wai = ST_MAGN_2_WAI_EXP,

		.wai = ST_MAGN_2_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LIS3MDL_MAGN_DEV_NAME,

			[0] = LIS3MDL_MAGN_DEV_NAME,

		},

		},

drivers/iio/pressure/st_pressure_core.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -178,6 +178,7 @@ static const struct iio_chan_spec st_press_lps001wp_channels[] = { 
static const struct st_sensor_settings st_press_sensors_settings[] = {

static const struct st_sensor_settings st_press_sensors_settings[] = {

	{

	{

		.wai = ST_PRESS_LPS331AP_WAI_EXP,

		.wai = ST_PRESS_LPS331AP_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LPS331AP_PRESS_DEV_NAME,

			[0] = LPS331AP_PRESS_DEV_NAME,

		},

		},
@@ -225,6 +226,7 @@ static const struct st_sensor_settings st_press_sensors_settings[] = { 
	},

	},

	{

	{

		.wai = ST_PRESS_LPS001WP_WAI_EXP,

		.wai = ST_PRESS_LPS001WP_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LPS001WP_PRESS_DEV_NAME,

			[0] = LPS001WP_PRESS_DEV_NAME,

		},

		},
@@ -260,6 +262,7 @@ static const struct st_sensor_settings st_press_sensors_settings[] = { 
	},

	},

	{

	{

		.wai = ST_PRESS_LPS25H_WAI_EXP,

		.wai = ST_PRESS_LPS25H_WAI_EXP,

		.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,

		.sensors_supported = {

		.sensors_supported = {

			[0] = LPS25H_PRESS_DEV_NAME,

			[0] = LPS25H_PRESS_DEV_NAME,

		},

		},