Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7df4d0c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A few driver and documentation fixes, plus a fix for double error
  handling which had crept in due to the confusing documentation - it
  wasn't clear if the core or the driver was responsible for cleanup in
  error cases so both tried to do it with unfortunate results"

* tag 'spi-v3.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: nuc900: Set SPI_LSB_FIRST for master->mode_bits if hw->pdata->lsb is true
  spi: rspi: Document support for Renesas QSPI in Kconfig
  spi: Fix crash with double message finalisation on error handling
  spi: correct the transfer_one_message documentation wording
  spi: document the transfer_one spi_master callback
  spi: spi.h: clarify the documentation of transfer_one
parents 641f832c cf20662d

Documentation/spi/spi-summary

+16 −1
Original line number Diff line number Diff line
@@ -543,7 +543,22 @@ SPI MASTER METHODS 
	queuing transfers that arrive in the meantime. When the driver is

	finished with this message, it must call

	spi_finalize_current_message() so the subsystem can issue the next

	transfer. This may sleep.

	message. This may sleep.



    master->transfer_one(struct spi_master *master, struct spi_device *spi,

			 struct spi_transfer *transfer)

	The subsystem calls the driver to transfer a single transfer while

	queuing transfers that arrive in the meantime. When the driver is

	finished with this transfer, it must call

	spi_finalize_current_transfer() so the subsystem can issue the next

	transfer. This may sleep. Note: transfer_one and transfer_one_message

	are mutually exclusive; when both are set, the generic subsystem does

	not call your transfer_one callback.



	Return values:

	negative errno: error

	0: transfer is finished

	1: transfer is still in progress



    DEPRECATED METHODS

drivers/spi/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -376,10 +376,10 @@ config SPI_PXA2XX_PCI 
	def_tristate SPI_PXA2XX && PCI



config SPI_RSPI

	tristate "Renesas RSPI controller"

	tristate "Renesas RSPI/QSPI controller"

	depends on (SUPERH && SH_DMAE_BASE) || ARCH_SHMOBILE

	help

	  SPI driver for Renesas RSPI blocks.

	  SPI driver for Renesas RSPI and QSPI blocks.



config SPI_S3C24XX

	tristate "Samsung S3C24XX series SPI"

drivers/spi/spi-nuc900.c

+2 −0
Original line number Diff line number Diff line
@@ -361,6 +361,8 @@ static int nuc900_spi_probe(struct platform_device *pdev) 
	init_completion(&hw->done);



	master->mode_bits          = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;

	if (hw->pdata->lsb)

		master->mode_bits |= SPI_LSB_FIRST;

	master->num_chipselect     = hw->pdata->num_cs;

	master->bus_num            = hw->pdata->bus_num;

	hw->bitbang.master         = hw->master;

drivers/spi/spi.c

+1 −3
Original line number Diff line number Diff line
@@ -755,9 +755,7 @@ static void spi_pump_messages(struct kthread_work *work) 
	ret = master->transfer_one_message(master, master->cur_msg);

	if (ret) {

		dev_err(&master->dev,

			"failed to transfer one message from queue: %d\n", ret);

		master->cur_msg->status = ret;

		spi_finalize_current_message(master);

			"failed to transfer one message from queue\n");

		return;

	}

}

include/linux/spi/spi.h

+5 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) 
 *	message while queuing transfers that arrive in the meantime. When the

 *	driver is finished with this message, it must call

 *	spi_finalize_current_message() so the subsystem can issue the next

 *	transfer

 *	message

 * @unprepare_transfer_hardware: there are currently no more messages on the

 *	queue so the subsystem notifies the driver that it may relax the

 *	hardware by issuing this call
@@ -287,7 +287,10 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) 
 *                  - return 1 if the transfer is still in progress. When

 *                    the driver is finished with this transfer it must

 *                    call spi_finalize_current_transfer() so the subsystem

 *                    can issue the next transfer

 *                    can issue the next transfer. Note: transfer_one and

 *                    transfer_one_message are mutually exclusive; when both

 *                    are set, the generic subsystem does not call your

 *                    transfer_one callback.

 * @unprepare_message: undo any work done by prepare_message().

 * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS

 *	number. Any individual value may be -ENOENT for CS lines that