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

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

Pull staging driver fixes from Greg KH:
 "Here are some tiny staging driver and documentation fixes for 4.3-rc3.

  All of these resolve reported issues that people have found and have
  been in the linux-next tree for a while with no problems"

* tag 'staging-4.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  MAINTAINERS: Update email address for Martyn Welch
  staging: ion: fix corruption of ion_import_dma_buf
  staging: dgap: Remove myself from the MAINTAINERS file
  staging: most: Add dependency to HAS_IOMEM
  staging: unisys: remove reference of visorutil
  staging: unisys: visornic: handle error return from device registration
  staging: unisys: stop device registration before visorbus registration
  staging: unisys: visorbus: Unregister driver on error
  staging: unisys: visornic: Fix receive bytes statistics
  staging: unisys: unregister netdev when create debugfs fails
  staging: fbtft: replace master->setup() with spi_setup()
  staging: fbtft: fix 9-bit SPI support detection
  staging/lustre: change Lustre URLs and mailing list
  staging/android: Update ION TODO per LPC discussion
  Staging: most: MOST and MOSTCORE should depend on HAS_DMA
  staging: most: fix HDM_USB dependencies and build errors
parents 7c1efeae 74c600e3

MAINTAINERS

+3 −4
Original line number Diff line number Diff line
@@ -3401,7 +3401,6 @@ F: drivers/staging/dgnc/ 


DIGI EPCA PCI PRODUCTS

M:	Lidza Louina <lidza.louina@gmail.com>

M:	Mark Hounschell <markh@compro.net>

M:	Daeseok Youn <daeseok.youn@gmail.com>

L:	driverdev-devel@linuxdriverproject.org

S:	Maintained
@@ -9910,8 +9909,8 @@ F: drivers/staging/media/lirc/ 
STAGING - LUSTRE PARALLEL FILESYSTEM

M:	Oleg Drokin <oleg.drokin@intel.com>

M:	Andreas Dilger <andreas.dilger@intel.com>

L:	HPDD-discuss@lists.01.org (moderated for non-subscribers)

W:	http://lustre.opensfs.org/

L:	lustre-devel@lists.lustre.org (moderated for non-subscribers)

W:	http://wiki.lustre.org/

S:	Maintained

F:	drivers/staging/lustre
@@ -11203,7 +11202,7 @@ F: drivers/vlynq/vlynq.c 
F:	include/linux/vlynq.h



VME SUBSYSTEM

M:	Martyn Welch <martyn.welch@ge.com>

M:	Martyn Welch <martyn@welchs.me.uk>

M:	Manohar Vanga <manohar.vanga@gmail.com>

M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

L:	devel@driverdev.osuosl.org

drivers/staging/android/TODO

+20 −0
Original line number Diff line number Diff line
@@ -5,5 +5,25 @@ TODO: 
	- add proper arch dependencies as needed

	- audit userspace interfaces to make sure they are sane





ion/

 - Remove ION_IOC_SYNC: Flushing for devices should be purely a kernel internal

   interface on top of dma-buf. flush_for_device needs to be added to dma-buf

   first.

 - Remove ION_IOC_CUSTOM: Atm used for cache flushing for cpu access in some

   vendor trees. Should be replaced with an ioctl on the dma-buf to expose the

   begin/end_cpu_access hooks to userspace.

 - Clarify the tricks ion plays with explicitly managing coherency behind the

   dma api's back (this is absolutely needed for high-perf gpu drivers): Add an

   explicit coherency management mode to flush_for_device to be used by drivers

   which want to manage caches themselves and which indicates whether cpu caches

   need flushing.

 - With those removed there's probably no use for ION_IOC_IMPORT anymore either

   since ion would just be the central allocator for shared buffers.

 - Add dt-binding to expose cma regions as ion heaps, with the rule that any

   such cma regions must already be used by some device for dma. I.e. ion only

   exposes existing cma regions and doesn't reserve unecessarily memory when

   booting a system which doesn't use ion.



Please send patches to Greg Kroah-Hartman <greg@kroah.com> and Cc:

Arve Hjønnevåg <arve@android.com> and Riley Andrews <riandrews@android.com>

drivers/staging/android/ion/ion.c

+3 −3
Original line number Diff line number Diff line
@@ -1179,13 +1179,13 @@ struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd) 
		mutex_unlock(&client->lock);

		goto end;

	}

	mutex_unlock(&client->lock);



	handle = ion_handle_create(client, buffer);

	if (IS_ERR(handle))

	if (IS_ERR(handle)) {

		mutex_unlock(&client->lock);

		goto end;

	}



	mutex_lock(&client->lock);

	ret = ion_handle_add(client, handle);

	mutex_unlock(&client->lock);

	if (ret) {

drivers/staging/fbtft/fb_uc1611.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int init_display(struct fbtft_par *par) 


	/* Set CS active high */

	par->spi->mode |= SPI_CS_HIGH;

	ret = par->spi->master->setup(par->spi);

	ret = spi_setup(par->spi);

	if (ret) {

		dev_err(par->info->device, "Could not set SPI_CS_HIGH\n");

		return ret;

drivers/staging/fbtft/fb_watterott.c

+2 −2
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int init_display(struct fbtft_par *par) 
	/* enable SPI interface by having CS and MOSI low during reset */

	save_mode = par->spi->mode;

	par->spi->mode |= SPI_CS_HIGH;

	ret = par->spi->master->setup(par->spi); /* set CS inactive low */

	ret = spi_setup(par->spi); /* set CS inactive low */

	if (ret) {

		dev_err(par->info->device, "Could not set SPI_CS_HIGH\n");

		return ret;
@@ -180,7 +180,7 @@ static int init_display(struct fbtft_par *par) 
	par->fbtftops.reset(par);

	mdelay(1000);

	par->spi->mode = save_mode;

	ret = par->spi->master->setup(par->spi);

	ret = spi_setup(par->spi);

	if (ret) {

		dev_err(par->info->device, "Could not restore SPI mode\n");

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE