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

Commit d91f9ecf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-fixes-for-3.14c' of... 

Merge tag 'iio-fixes-for-3.14c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus

Jonathan writes:

Third round of fixes for IIO in the 3.14 cycle.

Fixes to 2 Capella light sensor drivers where the units of the integration
time reported to userspace were out be a factor of a thousand.
These patches are as large as they are purely due to a variable rename
tied up with the incorrect scale.  The actual change is only a couple of lines.

1 patch dropping L3GD20H from the st gyroscope driver.  It never actually
worked as the address set is different from any others supported by the
driver currently.   An additional patch enables correct support for this
part but is too large to sensibly apply as a fix to some support that never
actually allowed the driver to be successfully probed on this part.
parents accb884b a0657716

drivers/iio/gyro/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ config IIO_ST_GYRO_3AXIS 
	select IIO_TRIGGERED_BUFFER if (IIO_BUFFER)

	select IIO_TRIGGERED_BUFFER if (IIO_BUFFER)

	help

	help

	  Say yes here to build support for STMicroelectronics gyroscopes:

	  Say yes here to build support for STMicroelectronics gyroscopes:

	  L3G4200D, LSM330DL, L3GD20, L3GD20H, LSM330DLC, L3G4IS, LSM330.

	  L3G4200D, LSM330DL, L3GD20, LSM330DLC, L3G4IS, LSM330.





	  This driver can also be built as a module. If so, these modules

	  This driver can also be built as a module. If so, these modules

	  will be created:

	  will be created:

drivers/iio/gyro/st_gyro.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#define LSM330DL_GYRO_DEV_NAME		"lsm330dl_gyro"

#define LSM330DL_GYRO_DEV_NAME		"lsm330dl_gyro"

#define LSM330DLC_GYRO_DEV_NAME		"lsm330dlc_gyro"

#define LSM330DLC_GYRO_DEV_NAME		"lsm330dlc_gyro"

#define L3GD20_GYRO_DEV_NAME		"l3gd20"

#define L3GD20_GYRO_DEV_NAME		"l3gd20"

#define L3GD20H_GYRO_DEV_NAME		"l3gd20h"

#define L3G4IS_GYRO_DEV_NAME		"l3g4is_ui"

#define L3G4IS_GYRO_DEV_NAME		"l3g4is_ui"

#define LSM330_GYRO_DEV_NAME		"lsm330_gyro"

#define LSM330_GYRO_DEV_NAME		"lsm330_gyro"

drivers/iio/gyro/st_gyro_core.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -167,11 +167,10 @@ static const struct st_sensors st_gyro_sensors[] = { 
		.wai = ST_GYRO_2_WAI_EXP,

		.wai = ST_GYRO_2_WAI_EXP,

		.sensors_supported = {

		.sensors_supported = {

			[0] = L3GD20_GYRO_DEV_NAME,

			[0] = L3GD20_GYRO_DEV_NAME,

			[1] = L3GD20H_GYRO_DEV_NAME,

			[1] = LSM330D_GYRO_DEV_NAME,

			[2] = LSM330D_GYRO_DEV_NAME,

			[2] = LSM330DLC_GYRO_DEV_NAME,

			[3] = LSM330DLC_GYRO_DEV_NAME,

			[3] = L3G4IS_GYRO_DEV_NAME,

			[4] = L3G4IS_GYRO_DEV_NAME,

			[4] = LSM330_GYRO_DEV_NAME,

			[5] = LSM330_GYRO_DEV_NAME,

		},

		},

		.ch = (struct iio_chan_spec *)st_gyro_16bit_channels,

		.ch = (struct iio_chan_spec *)st_gyro_16bit_channels,

		.odr = {

		.odr = {

drivers/iio/gyro/st_gyro_i2c.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -55,7 +55,6 @@ static const struct i2c_device_id st_gyro_id_table[] = { 
	{ LSM330DL_GYRO_DEV_NAME },

	{ LSM330DL_GYRO_DEV_NAME },

	{ LSM330DLC_GYRO_DEV_NAME },

	{ LSM330DLC_GYRO_DEV_NAME },

	{ L3GD20_GYRO_DEV_NAME },

	{ L3GD20_GYRO_DEV_NAME },

	{ L3GD20H_GYRO_DEV_NAME },

	{ L3G4IS_GYRO_DEV_NAME },

	{ L3G4IS_GYRO_DEV_NAME },

	{ LSM330_GYRO_DEV_NAME },

	{ LSM330_GYRO_DEV_NAME },

	{},

	{},

drivers/iio/gyro/st_gyro_spi.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,6 @@ static const struct spi_device_id st_gyro_id_table[] = { 
	{ LSM330DL_GYRO_DEV_NAME },

	{ LSM330DL_GYRO_DEV_NAME },

	{ LSM330DLC_GYRO_DEV_NAME },

	{ LSM330DLC_GYRO_DEV_NAME },

	{ L3GD20_GYRO_DEV_NAME },

	{ L3GD20_GYRO_DEV_NAME },

	{ L3GD20H_GYRO_DEV_NAME },

	{ L3G4IS_GYRO_DEV_NAME },

	{ L3G4IS_GYRO_DEV_NAME },

	{ LSM330_GYRO_DEV_NAME },

	{ LSM330_GYRO_DEV_NAME },

	{},

	{},