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

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

Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/config',... 

Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/config', 'spi/topic/dln2' and 'spi/topic/dw' into spi-next
parents 81306d53 1369dea6 78d97a57 2b5e368e d9c14743

arch/x86/pci/intel_mid_pci.c

+0 −1
Original line number Diff line number Diff line
@@ -293,7 +293,6 @@ static void mrst_power_off_unused_dev(struct pci_dev *dev) 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0801, mrst_power_off_unused_dev);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0809, mrst_power_off_unused_dev);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x080C, mrst_power_off_unused_dev);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0812, mrst_power_off_unused_dev);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0815, mrst_power_off_unused_dev);



/*

drivers/spi/Kconfig

+10 −1
Original line number Diff line number Diff line
@@ -185,6 +185,16 @@ config SPI_DAVINCI 
	help

	  SPI master controller for DaVinci/DA8x/OMAP-L/AM1x SPI modules.



config SPI_DLN2

       tristate "Diolan DLN-2 USB SPI adapter"

       depends on MFD_DLN2

       help

         If you say yes to this option, support will be included for Diolan

         DLN2, a USB to SPI interface.



         This driver can also be built as a module.  If so, the module

         will be called spi-dln2.



config SPI_EFM32

	tristate "EFM32 SPI controller"

	depends on OF && ARM && (ARCH_EFM32 || COMPILE_TEST)
@@ -595,7 +605,6 @@ config SPI_XTENSA_XTFPGA 
	  16 bit words in SPI mode 0, automatically asserting CS on transfer

	  start and deasserting on end.





config SPI_NUC900

	tristate "Nuvoton NUC900 series SPI"

	depends on ARCH_W90X900

drivers/spi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ obj-$(CONFIG_SPI_CADENCE) += spi-cadence.o 
obj-$(CONFIG_SPI_CLPS711X)		+= spi-clps711x.o

obj-$(CONFIG_SPI_COLDFIRE_QSPI)		+= spi-coldfire-qspi.o

obj-$(CONFIG_SPI_DAVINCI)		+= spi-davinci.o

obj-$(CONFIG_SPI_DLN2)			+= spi-dln2.o

obj-$(CONFIG_SPI_DESIGNWARE)		+= spi-dw.o

obj-$(CONFIG_SPI_DW_MMIO)		+= spi-dw-mmio.o

obj-$(CONFIG_SPI_DW_PCI)		+= spi-dw-midpci.o

drivers/spi/spi-atmel.c

+5 −7
Original line number Diff line number Diff line
@@ -1046,6 +1046,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, 
	struct atmel_spi_device	*asd;

	int			timeout;

	int			ret;

	unsigned long		dma_timeout;



	as = spi_master_get_devdata(master);
@@ -1103,15 +1104,12 @@ static int atmel_spi_one_transfer(struct spi_master *master, 


		/* interrupts are disabled, so free the lock for schedule */

		atmel_spi_unlock(as);

		ret = wait_for_completion_timeout(&as->xfer_completion,

		dma_timeout = wait_for_completion_timeout(&as->xfer_completion,

							  SPI_DMA_TIMEOUT);

		atmel_spi_lock(as);

		if (WARN_ON(ret == 0)) {

			dev_err(&spi->dev,

				"spi trasfer timeout, err %d\n", ret);

		if (WARN_ON(dma_timeout == 0)) {

			dev_err(&spi->dev, "spi transfer timeout\n");

			as->done_status = -EIO;

		} else {

			ret = 0;

		}



		if (as->done_status)

drivers/spi/spi-dln2.c

0 → 100644
+881 −0

File added.

Preview size limit exceeded, changes collapsed.