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

Commit 79d2d21e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull spi fixes from Mark Brown:
 "A few driver specific fixes, the main one being the fix for handling
  of complete callbacks that are open coded in individual drivers to
  allow callers to omit the completion.  As we move things into the core
  that sort of issue should become less and less common"

* tag 'spi-v3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: qup: Depend on ARCH_QCOM
  spi: efm32: Update binding document to make "efm32,location" property optional
  spi: omap2-mcspi: Convert to use devm_kcalloc
  spi: Always check complete callback before calling it
parents c0c4cf06 6eadd846

Documentation/devicetree/bindings/spi/efm32-spi.txt

+7 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,13 @@ Required properties: 
- interrupts: pair specifying rx and tx irq

- interrupts: pair specifying rx and tx irq

- clocks: phandle to the spi clock

- clocks: phandle to the spi clock

- cs-gpios: see spi-bus.txt

- cs-gpios: see spi-bus.txt

- efm32,location: Value to write to the ROUTE register's LOCATION bitfield to configure the pinmux for the device, see datasheet for values.



Recommended properties :

- efm32,location: Value to write to the ROUTE register's LOCATION bitfield to

                  configure the pinmux for the device, see datasheet for values.

                  If "efm32,location" property is not provided, keeping what is

                  already configured in the hardware, so its either the reset

                  default 0 or whatever the bootloader did.





Example:

Example:

drivers/spi/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -383,7 +383,7 @@ config SPI_RSPI 




config SPI_QUP

config SPI_QUP

	tristate "Qualcomm SPI controller with QUP interface"

	tristate "Qualcomm SPI controller with QUP interface"

	depends on ARCH_MSM_DT || (ARM && COMPILE_TEST)

	depends on ARCH_QCOM || (ARM && COMPILE_TEST)

	help

	help

	  Qualcomm Universal Peripheral (QUP) core is an AHB slave that

	  Qualcomm Universal Peripheral (QUP) core is an AHB slave that

	  provides a common data path (an output FIFO and an input FIFO)

	  provides a common data path (an output FIFO and an input FIFO)

drivers/spi/spi-fsl-espi.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -441,6 +441,7 @@ static void fsl_espi_do_one_msg(struct spi_message *m) 




	m->actual_length = espi_trans.actual_length;

	m->actual_length = espi_trans.actual_length;

	m->status = espi_trans.status;

	m->status = espi_trans.status;

	if (m->complete)

		m->complete(m->context);

		m->complete(m->context);

}

}

drivers/spi/spi-fsl-spi.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -408,6 +408,7 @@ static void fsl_spi_do_one_msg(struct spi_message *m) 
	}

	}





	m->status = status;

	m->status = status;

	if (m->complete)

		m->complete(m->context);

		m->complete(m->context);





	if (status || !cs_change) {

	if (status || !cs_change) {

drivers/spi/spi-mpc512x-psc.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -300,6 +300,7 @@ static int mpc512x_psc_spi_msg_xfer(struct spi_master *master, 
	}

	}





	m->status = status;

	m->status = status;

	if (m->complete)

		m->complete(m->context);

		m->complete(m->context);





	if (status || !cs_change)

	if (status || !cs_change)