Commit dd892625 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull IIO fixes and staging driver from Greg KH:
 "Here is a mix of a number of IIO driver fixes for 5.4-rc7, and a whole
  new staging driver.

  The IIO fixes resolve some reported issues, all are tiny.

  The staging driver addition is the vboxsf filesystem, which is the
  VirtualBox guest shared folder code. Hans has been trying to get
  filesystem reviewers to review the code for many months now, and
  Christoph finally said to just merge it in staging now as it is
  stand-alone and the filesystem people can review it easier over time
  that way.

  I know it's late for this big of an addition, but it is stand-alone.

  The code has been in linux-next for a while, long enough to pick up a
  few tiny fixes for it already so people are looking at it.

  All of these have been in linux-next with no reported issues"

* tag 'staging-5.4-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: Fix error return code in vboxsf_fill_super()
  staging: vboxsf: fix dereference of pointer dentry before it is null checked
  staging: vboxsf: Remove unused including <linux/version.h>
  staging: Add VirtualBox guest shared folder (vboxsf) support
  iio: adc: stm32-adc: fix stopping dma
  iio: imu: inv_mpu6050: fix no data on MPU6050
  iio: srf04: fix wrong limitation in distance measuring
  iio: imu: adis16480: make sure provided frequency is positive
parents 3de2a3e9 e39fcaef

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -17339,6 +17339,12 @@ F: include/linux/vbox_utils.h 
F:	include/uapi/linux/vbox*.h

F:	drivers/virt/vboxguest/













VIRTUAL BOX SHARED FOLDER VFS DRIVER:













M:	Hans de Goede <hdegoede@redhat.com>













L:	linux-fsdevel@vger.kernel.org













S:	Maintained













F:	drivers/staging/vboxsf/*



























VIRTUAL SERIO DEVICE DRIVER















M:	Stephen Chandler Paul <thatslyude@gmail.com>















S:	Maintained

































drivers/iio/adc/stm32-adc.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -1399,7 +1399,7 @@ static int stm32_adc_dma_start(struct iio_dev *indio_dev)













	cookie = dmaengine_submit(desc);















	ret = dma_submit_error(cookie);















	if (ret) {













		dmaengine_terminate_all(adc->dma_chan);













		dmaengine_terminate_sync(adc->dma_chan);















		return ret;















	}


























@@ -1477,7 +1477,7 @@ static void __stm32_adc_buffer_predisable(struct iio_dev *indio_dev)













		stm32_adc_conv_irq_disable(adc);































	if (adc->dma_chan)













		dmaengine_terminate_all(adc->dma_chan);













		dmaengine_terminate_sync(adc->dma_chan);































	if (stm32_adc_set_trig(indio_dev, NULL))















		dev_err(&indio_dev->dev, "Can't clear trigger\n");

































drivers/iio/imu/adis16480.c



+4
−1






























Original line number
Diff line number
Diff line








@@ -317,8 +317,11 @@ static int adis16480_set_freq(struct iio_dev *indio_dev, int val, int val2)













	struct adis16480 *st = iio_priv(indio_dev);















	unsigned int t, reg;





























	if (val < 0 || val2 < 0)













		return -EINVAL;





























	t =  val * 1000 + val2 / 1000;













	if (t <= 0)













	if (t == 0)















		return -EINVAL;































	/*

































drivers/iio/imu/inv_mpu6050/inv_mpu_core.c



+9
−0






























Original line number
Diff line number
Diff line








@@ -114,54 +114,63 @@ static const struct inv_mpu6050_hw hw_info[] = {













		.name = "MPU6050",















		.reg = &reg_set_6050,















		.config = &chip_config_6050,













		.fifo_size = 1024,















	},















	{















		.whoami = INV_MPU6500_WHOAMI_VALUE,















		.name = "MPU6500",















		.reg = &reg_set_6500,















		.config = &chip_config_6050,













		.fifo_size = 512,















	},















	{















		.whoami = INV_MPU6515_WHOAMI_VALUE,















		.name = "MPU6515",















		.reg = &reg_set_6500,















		.config = &chip_config_6050,













		.fifo_size = 512,















	},















	{















		.whoami = INV_MPU6000_WHOAMI_VALUE,















		.name = "MPU6000",















		.reg = &reg_set_6050,















		.config = &chip_config_6050,













		.fifo_size = 1024,















	},















	{















		.whoami = INV_MPU9150_WHOAMI_VALUE,















		.name = "MPU9150",















		.reg = &reg_set_6050,















		.config = &chip_config_6050,













		.fifo_size = 1024,















	},















	{















		.whoami = INV_MPU9250_WHOAMI_VALUE,















		.name = "MPU9250",















		.reg = &reg_set_6500,















		.config = &chip_config_6050,













		.fifo_size = 512,















	},















	{















		.whoami = INV_MPU9255_WHOAMI_VALUE,















		.name = "MPU9255",















		.reg = &reg_set_6500,















		.config = &chip_config_6050,













		.fifo_size = 512,















	},















	{















		.whoami = INV_ICM20608_WHOAMI_VALUE,















		.name = "ICM20608",















		.reg = &reg_set_6500,















		.config = &chip_config_6050,













		.fifo_size = 512,















	},















	{















		.whoami = INV_ICM20602_WHOAMI_VALUE,















		.name = "ICM20602",















		.reg = &reg_set_icm20602,















		.config = &chip_config_6050,













		.fifo_size = 1008,















	},















};

















































drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h



+2
−0






























Original line number
Diff line number
Diff line








@@ -100,12 +100,14 @@ struct inv_mpu6050_chip_config {













 *  @name:      name of the chip.















 *  @reg:   register map of the chip.















 *  @config:    configuration of the chip.













 *  @fifo_size:	size of the FIFO in bytes.















 */















struct inv_mpu6050_hw {















	u8 whoami;















	u8 *name;















	const struct inv_mpu6050_reg_map *reg;















	const struct inv_mpu6050_chip_config *config;













	size_t fifo_size;















};































/*









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE