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

Commit 6eadd846 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/complete', 'spi/fix/efm32',... 

Merge remote-tracking branches 'spi/fix/complete', 'spi/fix/efm32', 'spi/fix/omap2-mcspi' and 'spi/fix/qup' into spi-linus
parents 09c0998e 0a6d3879 e2872090 a6f936db 058f11c8

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

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

- clocks: phandle to the spi clock

- 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:

drivers/spi/Kconfig

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


config SPI_QUP

	tristate "Qualcomm SPI controller with QUP interface"

	depends on ARCH_MSM_DT || (ARM && COMPILE_TEST)

	depends on ARCH_QCOM || (ARM && COMPILE_TEST)

	help

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

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

drivers/spi/spi-fsl-espi.c

+2 −1
Original line number 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->status = espi_trans.status;

	if (m->complete)

		m->complete(m->context);

}

drivers/spi/spi-fsl-spi.c

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



	m->status = status;

	if (m->complete)

		m->complete(m->context);



	if (status || !cs_change) {

drivers/spi/spi-mpc512x-psc.c

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



	m->status = status;

	if (m->complete)

		m->complete(m->context);



	if (status || !cs_change)