Commit 4073195a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v6.9-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A small collection of fixes that came in since the merge window. Most
  of it is relatively minor driver specific fixes, there's also fixes
  for error handling with SPI flash devices and a fix restoring delay
  control functionality for non-GPIO chip selects managed by the core"

* tag 'spi-fix-v6.9-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: spi-mt65xx: Fix NULL pointer access in interrupt handler
  spi: docs: spidev: fix echo command format
  spi: spi-imx: fix off-by-one in mx51 CPU mode burst length
  spi: lm70llp: fix links in doc and comments
  spi: Fix error code checking in spi_mem_exec_op()
  spi: Restore delays for non-GPIO chip select
  spi: lpspi: Avoid potential use-after-free in probe()
parents 8c826bd9 a20ad450

Documentation/spi/spi-lm70llp.rst

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Supported board/chip: 


  * National Semiconductor LM70 LLP evaluation board



    Datasheet: http://www.national.com/pf/LM/LM70.html

    Datasheet: https://www.ti.com/lit/gpn/lm70



Author:

        Kaiwan N Billimoria <kaiwan@designergraphix.com>
@@ -28,7 +28,7 @@ Hardware Interfacing 
The schematic for this particular board (the LM70EVAL-LLP) is

available (on page 4) here:



  http://www.national.com/appinfo/tempsensors/files/LM70LLPEVALmanual.pdf

  https://download.datasheets.com/pdfs/documentation/nat/kit&board/lm70llpevalmanual.pdf



The hardware interfacing on the LM70 LLP eval board is as follows:

Documentation/spi/spidev.rst

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ the spidev driver failing to probe. 


Sysfs also supports userspace driven binding/unbinding of drivers to

devices that do not bind automatically using one of the tables above.

To make the spidev driver bind to such a device, use the following:

To make the spidev driver bind to such a device, use the following::



    echo spidev > /sys/bus/spi/devices/spiB.C/driver_override

    echo spiB.C > /sys/bus/spi/drivers/spidev/bind

drivers/spi/spi-fsl-lpspi.c

+4 −4
Original line number Diff line number Diff line
@@ -830,10 +830,10 @@ static int fsl_lpspi_probe(struct platform_device *pdev) 


	is_target = of_property_read_bool((&pdev->dev)->of_node, "spi-slave");

	if (is_target)

		controller = spi_alloc_target(&pdev->dev,

		controller = devm_spi_alloc_target(&pdev->dev,

						   sizeof(struct fsl_lpspi_data));

	else

		controller = spi_alloc_host(&pdev->dev,

		controller = devm_spi_alloc_host(&pdev->dev,

						 sizeof(struct fsl_lpspi_data));



	if (!controller)

drivers/spi/spi-imx.c

+2 −2
Original line number Diff line number Diff line
@@ -668,8 +668,8 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, 
				ctrl |= (MX51_ECSPI_CTRL_MAX_BURST * BITS_PER_BYTE - 1)

						<< MX51_ECSPI_CTRL_BL_OFFSET;

			else

				ctrl |= spi_imx->count / DIV_ROUND_UP(spi_imx->bits_per_word,

						BITS_PER_BYTE) * spi_imx->bits_per_word

				ctrl |= (spi_imx->count / DIV_ROUND_UP(spi_imx->bits_per_word,

						BITS_PER_BYTE) * spi_imx->bits_per_word - 1)

						<< MX51_ECSPI_CTRL_BL_OFFSET;

		}

	}

drivers/spi/spi-lm70llp.c

+2 −2
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
 *

 * Datasheet and Schematic:

 * The LM70 is a temperature sensor chip from National Semiconductor; its

 * datasheet is available at http://www.national.com/pf/LM/LM70.html

 * datasheet is available at https://www.ti.com/lit/gpn/lm70

 * The schematic for this particular board (the LM70EVAL-LLP) is

 * available (on page 4) here:

 *  http://www.national.com/appinfo/tempsensors/files/LM70LLPEVALmanual.pdf

 *  https://download.datasheets.com/pdfs/documentation/nat/kit&board/lm70llpevalmanual.pdf

 *

 * Also see Documentation/spi/spi-lm70llp.rst.  The SPI<->parport code here is

 * (heavily) based on spi-butterfly by David Brownell.