Commit 9ff7aeb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging tree fixes from Greg KH:
 "Here are a few IIO fixes, and a new device id for a staging driver for
  3.14-rc5.  All have been in linux-next for a while, I did a final
  merge to get the IIO fixes into this tree, they were incorrectly in
  the char-misc tree for a few weeks, and I forgot to tell you to pull
  them from there.  This makes it a single pull request for you"

* tag 'staging-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: r8188eu: Add new device ID
  staging:iio:adc:MXS:LRADC: fix touchscreen statemachine
  iio:gyro: bug on L3GD20H gyroscope support
  iio: cm32181: Change cm32181 ambient light sensor driver
  iio: cm36651: Fix read/write integration time function.
parents 3154da34 9f4a9b83

drivers/iio/gyro/Kconfig

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

	help

	  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

	  will be created:

drivers/iio/gyro/st_gyro.h

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

#define LSM330DLC_GYRO_DEV_NAME		"lsm330dlc_gyro"

#define L3GD20_GYRO_DEV_NAME		"l3gd20"

#define L3GD20H_GYRO_DEV_NAME		"l3gd20h"

#define L3G4IS_GYRO_DEV_NAME		"l3g4is_ui"

#define LSM330_GYRO_DEV_NAME		"lsm330_gyro"

drivers/iio/gyro/st_gyro_core.c

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

		.sensors_supported = {

			[0] = L3GD20_GYRO_DEV_NAME,

			[1] = L3GD20H_GYRO_DEV_NAME,

			[2] = LSM330D_GYRO_DEV_NAME,

			[3] = LSM330DLC_GYRO_DEV_NAME,

			[4] = L3G4IS_GYRO_DEV_NAME,

			[5] = LSM330_GYRO_DEV_NAME,

			[1] = LSM330D_GYRO_DEV_NAME,

			[2] = LSM330DLC_GYRO_DEV_NAME,

			[3] = L3G4IS_GYRO_DEV_NAME,

			[4] = LSM330_GYRO_DEV_NAME,

		},

		.ch = (struct iio_chan_spec *)st_gyro_16bit_channels,

		.odr = {

drivers/iio/gyro/st_gyro_i2c.c

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

	{ LSM330DLC_GYRO_DEV_NAME },

	{ L3GD20_GYRO_DEV_NAME },

	{ L3GD20H_GYRO_DEV_NAME },

	{ L3G4IS_GYRO_DEV_NAME },

	{ LSM330_GYRO_DEV_NAME },

	{},

drivers/iio/gyro/st_gyro_spi.c

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

	{ LSM330DLC_GYRO_DEV_NAME },

	{ L3GD20_GYRO_DEV_NAME },

	{ L3GD20H_GYRO_DEV_NAME },

	{ L3G4IS_GYRO_DEV_NAME },

	{ LSM330_GYRO_DEV_NAME },

	{},

CRA Git | Maintained and supported by SUSTech CRA and CCSE