Commit 45d9ab8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging/IIO driver fixes from Greg KH:
 "Here are a few small staging and iio driver fixes for -rc4.

  Nothing major, just a few small bugfixes for some reported issues, and
  a MAINTAINERS file update for the fbtft drivers.

  We also re-enable the building of the erofs filesystem as the XArray
  patches that were causing it to break never got merged in the -rc1
  cycle, so there's no reason it can't be turned back on for now. The
  problem that was previously there is now being handled in the Xarray
  tree at the moment, so it will not hit us again in the future.

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

* tag 'staging-4.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: vboxvideo: Change address of scanout buffer on page-flip
  staging: vboxvideo: Fix IRQs no longer working
  staging: gasket: TODO: re-implement using UIO
  staging/fbtft: Update TODO and mailing lists
  staging: erofs: rename superblock flags (MS_xyz -> SB_xyz)
  iio: imu: st_lsm6dsx: take into account ts samples in wm configuration
  Revert "iio: temperature: maxim_thermocouple: add MAX31856 part"
  Revert "staging: erofs: disable compiling temporarile"
  MAINTAINERS: Switch a maintainer for drivers/staging/gasket
  staging: wilc1000: revert "fix TODO to compile spi and sdio components in single module"
parents 319cbacf 65aac174

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -5625,6 +5625,8 @@ F: lib/fault-inject.c 


FBTFT Framebuffer drivers

M:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

L:	dri-devel@lists.freedesktop.org

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/staging/fbtft/
@@ -6060,7 +6062,7 @@ F: Documentation/gcc-plugins.txt 


GASKET DRIVER FRAMEWORK

M:	Rob Springer <rspringer@google.com>

M:	John Joseph <jnjoseph@google.com>

M:	Todd Poynor <toddpoynor@google.com>

M:	Ben Chan <benchan@chromium.org>

S:	Maintained

F:	drivers/staging/gasket/

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c

+6 −7
Original line number Diff line number Diff line
@@ -187,12 +187,15 @@ static int st_lsm6dsx_set_fifo_odr(struct st_lsm6dsx_sensor *sensor, 


int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, u16 watermark)

{

	u16 fifo_watermark = ~0, cur_watermark, sip = 0, fifo_th_mask;

	u16 fifo_watermark = ~0, cur_watermark, fifo_th_mask;

	struct st_lsm6dsx_hw *hw = sensor->hw;

	struct st_lsm6dsx_sensor *cur_sensor;

	int i, err, data;

	__le16 wdata;



	if (!hw->sip)

		return 0;



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

		cur_sensor = iio_priv(hw->iio_devs[i]);
@@ -203,14 +206,10 @@ int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, u16 watermark) 
						       : cur_sensor->watermark;



		fifo_watermark = min_t(u16, fifo_watermark, cur_watermark);

		sip += cur_sensor->sip;

	}



	if (!sip)

		return 0;



	fifo_watermark = max_t(u16, fifo_watermark, sip);

	fifo_watermark = (fifo_watermark / sip) * sip;

	fifo_watermark = max_t(u16, fifo_watermark, hw->sip);

	fifo_watermark = (fifo_watermark / hw->sip) * hw->sip;

	fifo_watermark = fifo_watermark * hw->settings->fifo_ops.th_wl;



	err = regmap_read(hw->regmap, hw->settings->fifo_ops.fifo_th.addr + 1,

drivers/iio/temperature/maxim_thermocouple.c

+0 −1
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ static int maxim_thermocouple_remove(struct spi_device *spi) 
static const struct spi_device_id maxim_thermocouple_id[] = {

	{"max6675", MAX6675},

	{"max31855", MAX31855},

	{"max31856", MAX31855},

	{},

};

MODULE_DEVICE_TABLE(spi, maxim_thermocouple_id);

drivers/staging/erofs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


config EROFS_FS

	tristate "EROFS filesystem support"

	depends on BROKEN

	depends on BLOCK

	help

	  EROFS(Enhanced Read-Only File System) is a lightweight

	  read-only file system with modern designs (eg. page-sized

drivers/staging/erofs/super.c

+2 −2
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static int erofs_read_super(struct super_block *sb, 
		goto err_sbread;



	sb->s_magic = EROFS_SUPER_MAGIC;

	sb->s_flags |= MS_RDONLY | MS_NOATIME;

	sb->s_flags |= SB_RDONLY | SB_NOATIME;

	sb->s_maxbytes = MAX_LFS_FILESIZE;

	sb->s_time_gran = 1;
@@ -627,7 +627,7 @@ static int erofs_remount(struct super_block *sb, int *flags, char *data) 
{

	BUG_ON(!sb_rdonly(sb));



	*flags |= MS_RDONLY;

	*flags |= SB_RDONLY;

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE