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

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

Pull staging driver updates from Greg KH:
 "Here is the "big" set of staging driver changes for 7.1-rc1.

  Nothing major in here at all, just lots of little cleanups for the
  staging drivers, driven by new developers getting their feet wet in
  kernel development. "Largest" thing in here is the change of some of
  the octeon variable types into proper kernel ones.

  Full details are in the shortlog.

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

* tag 'staging-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (154 commits)
  staging: rtl8723bs: remove redundant & parentheses
  staging: most: dim2: replace BUG_ON() in poison_channel()
  staging: most: dim2: replace BUG_ON() in enqueue()
  staging: most: dim2: replace BUG_ON() in configure_channel()
  staging: most: dim2: replace BUG_ON() in service_done_flag()
  staging: most: dim2: replace BUG_ON() in try_start_dim_transfer()
  staging: rtl8723bs: remove unused RTL8188E antenna selection macros
  staging: rtl8723bs: remove redundant blank lines in basic_types.h
  staging: rtl8723bs: wrap complex macros with parentheses
  staging: rtl8723bs: remove unused WRITEEF/READEF byte macros
  staging: rtl8723bs: rename camelCase variable
  staging: greybus: audio: fix error message for BTN_3 button
  staging: rtl8723bs: rename variables to snake_case
  staging: rtl8723bs: fix spelling in comment
  staging: rtl8723bs: cleanup return in sdio_init()
  staging: rtl8723bs: use direct returns in sdio_dvobj_init()
  staging: rtl8723bs: remove unused arg at odm_interface.h
  greybus: raw: fix use-after-free if write is called after disconnect
  greybus: raw: fix use-after-free on cdev close
  staging: rtl8723bs: fix logical continuations in xmit_linux.c
  ...
parents 99ef60d1 bf9c95f3

drivers/staging/axis-fifo/axis-fifo.c

+19 −40
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ struct axis_fifo { 


	unsigned int rx_fifo_depth;

	unsigned int tx_fifo_depth;

	int has_rx_fifo;

	int has_tx_fifo;

	u32 has_rx_fifo;

	u32 has_tx_fifo;



	wait_queue_head_t read_queue;

	struct mutex read_lock; /* lock for reading */
@@ -392,60 +392,39 @@ static int axis_fifo_parse_dt(struct axis_fifo *fifo) 


	ret = of_property_read_u32(node, "xlnx,axi-str-rxd-tdata-width",

				   &value);

	if (ret) {

		dev_err(fifo->dt_device, "missing xlnx,axi-str-rxd-tdata-width property\n");

		goto end;

	} else if (value != 32) {

		dev_err(fifo->dt_device, "xlnx,axi-str-rxd-tdata-width only supports 32 bits\n");

		ret = -EIO;

		goto end;

	}

	if (ret)

		return ret;

	if (value != 32)

		return -EINVAL;



	ret = of_property_read_u32(node, "xlnx,axi-str-txd-tdata-width",

				   &value);

	if (ret) {

		dev_err(fifo->dt_device, "missing xlnx,axi-str-txd-tdata-width property\n");

		goto end;

	} else if (value != 32) {

		dev_err(fifo->dt_device, "xlnx,axi-str-txd-tdata-width only supports 32 bits\n");

		ret = -EIO;

		goto end;

	}

	if (ret)

		return ret;

	if (value != 32)

		return -EINVAL;



	ret = of_property_read_u32(node, "xlnx,rx-fifo-depth",

				   &fifo->rx_fifo_depth);

	if (ret) {

		dev_err(fifo->dt_device, "missing xlnx,rx-fifo-depth property\n");

		ret = -EIO;

		goto end;

	}

	if (ret)

		return ret;



	ret = of_property_read_u32(node, "xlnx,tx-fifo-depth",

				   &fifo->tx_fifo_depth);

	if (ret) {

		dev_err(fifo->dt_device, "missing xlnx,tx-fifo-depth property\n");

		ret = -EIO;

		goto end;

	}

	if (ret)

		return ret;



	ret = of_property_read_u32(node, "xlnx,use-rx-data",

				   &fifo->has_rx_fifo);

	if (ret) {

		dev_err(fifo->dt_device, "missing xlnx,use-rx-data property\n");

		ret = -EIO;

		goto end;

	}

	if (ret)

		return ret;



	ret = of_property_read_u32(node, "xlnx,use-tx-data",

				   &fifo->has_tx_fifo);

	if (ret) {

		dev_err(fifo->dt_device, "missing xlnx,use-tx-data property\n");

		ret = -EIO;

		goto end;

	}



end:

	if (ret)

		return ret;



	return 0;

}



static int axis_fifo_probe(struct platform_device *pdev)

drivers/staging/fbtft/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -86,7 +86,11 @@ config FB_TFT_PCD8544 
config FB_TFT_RA8875

	tristate "FB driver for the RA8875 LCD Controller"

	help

	  Generic Framebuffer support for RA8875

	  This enables generic framebuffer support for the RAiO RA8875

	  display controller. The controller is intended for medium size text/graphic

	  mixed displays with a resolution of up to 800x480 pixels.



	  Say Y if you have such a display that utilizes this controller.



config FB_TFT_S6D02A1

	tristate "FB driver for the S6D02A1 LCD Controller"

drivers/staging/fbtft/README

+7 −22
Original line number Diff line number Diff line
@@ -6,27 +6,12 @@ The module 'fbtft' makes writing drivers for some of these displays very easy. 


Development is done on a Raspberry Pi running the Raspbian "wheezy" distribution.



INSTALLATION

  Download kernel sources

For new hardware support consider using DRM subsystem (see TODO).



  From Linux 3.15

    cd drivers/video/fbdev/fbtft

    git clone https://github.com/notro/fbtft.git

NOTE:



    Add to drivers/video/fbdev/Kconfig:   source "drivers/video/fbdev/fbtft/Kconfig"

    Add to drivers/video/fbdev/Makefile:  obj-y += fbtft/



  Before Linux 3.15

    cd drivers/video

    git clone https://github.com/notro/fbtft.git



    Add to drivers/video/Kconfig:   source "drivers/video/fbtft/Kconfig"

    Add to drivers/video/Makefile:  obj-y += fbtft/



  Enable driver(s) in menuconfig and build the kernel





See wiki for more information: https://github.com/notro/fbtft/wiki





Source: https://github.com/notro/fbtft/
 
The driver is in maintenance mode, only performance issue or bug fixes

are accepted, which effectively means the patches must be tested on

the real hardware (the patch must be accompanied with the information

what hardware is that). The treewide changes may also be accepted as

an exception.

drivers/staging/fbtft/fb_agm1264k-fl.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) 


			/* write bitmap */

			gpiod_set_value(par->RS, 1); /* RS->1 (data mode) */

			par->fbtftops.write(par, buf, len);

			ret = par->fbtftops.write(par, buf, len);

			if (ret < 0)

				dev_err(par->info->device,

					"write failed and returned: %d\n",

drivers/staging/fbtft/fb_hx8340bn.c

+0 −8
Original line number Diff line number Diff line
@@ -106,13 +106,6 @@ static int init_display(struct fbtft_par *par) 
	return 0;

}



static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)

{

	write_reg(par, MIPI_DCS_SET_COLUMN_ADDRESS, 0x00, xs, 0x00, xe);

	write_reg(par, MIPI_DCS_SET_PAGE_ADDRESS, 0x00, ys, 0x00, ye);

	write_reg(par, MIPI_DCS_WRITE_MEMORY_START);

}



static int set_var(struct fbtft_par *par)

{

	/* MADCTL - Memory data access control */
@@ -207,7 +200,6 @@ static struct fbtft_display display = { 
	.gamma = DEFAULT_GAMMA,

	.fbtftops = {

		.init_display = init_display,

		.set_addr_win = set_addr_win,

		.set_var = set_var,

		.set_gamma = set_gamma,

	},