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

Commit cf20662d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/doc', 'spi/fix/nuc900' and 'spi/fix/rspi' into spi-linus

parents 797d0dec e9305331 f7db1588 e290c343

Documentation/spi/spi-summary

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

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

	finished with this message, it must call

	finished with this message, it must call

	spi_finalize_current_message() so the subsystem can issue the next

	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

    DEPRECATED METHODS

drivers/spi/Kconfig

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

	def_tristate SPI_PXA2XX && PCI





config SPI_RSPI

config SPI_RSPI

	tristate "Renesas RSPI controller"

	tristate "Renesas RSPI/QSPI controller"

	depends on (SUPERH && SH_DMAE_BASE) || ARCH_SHMOBILE

	depends on (SUPERH && SH_DMAE_BASE) || ARCH_SHMOBILE

	help

	help

	  SPI driver for Renesas RSPI blocks.

	  SPI driver for Renesas RSPI and QSPI blocks.





config SPI_S3C24XX

config SPI_S3C24XX

	tristate "Samsung S3C24XX series SPI"

	tristate "Samsung S3C24XX series SPI"

drivers/spi/spi-nuc900.c

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

	init_completion(&hw->done);





	master->mode_bits          = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;

	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->num_chipselect     = hw->pdata->num_cs;

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

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

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

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

include/linux/spi/spi.h

+5 −2
Original line number Original line 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

 *	message while queuing transfers that arrive in the meantime. When the

 *	driver is finished with this message, it must call

 *	driver is finished with this message, it must call

 *	spi_finalize_current_message() so the subsystem can issue the next

 *	spi_finalize_current_message() so the subsystem can issue the next

 *	transfer

 *	message

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

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

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

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

 *	hardware by issuing this call

 *	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

 *                  - return 1 if the transfer is still in progress. When

 *                    the driver is finished with this transfer it must

 *                    the driver is finished with this transfer it must

 *                    call spi_finalize_current_transfer() so the subsystem

 *                    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().

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

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

 * @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

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