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

Commit 85adbcd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi updates from Mark Brown:
 "This release is mainly a collection of driver specific updates,
  including a few nice cleanups to make drivers use more core features.

   - automatically use the parent device to allocate DMA buffers if
     there wasn't an explicitly configured device.

   - fixes for leaks on allocation.

   - a small piece of the start of SPI slave support, a feature that's
     been on the cards for over a decade!"

* tag 'spi-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (55 commits)
  spi: spi-ti-qspi: Fix error handling
  spi: spi-ti-qspi: Fix error handling
  spi: lantiq-ssc: activate under COMPILE_TEST
  spi: armada-3700: Remove spi_master_put in a3700_spi_remove()
  spi: ti-qspi: revise ti_qspi_probe() failure flow
  spi: spi-ep93xx: simplify GPIO chip selects
  spi: rspi: Replaces "n" by "len" in qspi_transfer_*()
  spi: rspi: Fixes bogus received byte in qspi_transfer_in()
  spi: bcm-qspi: Remove unnecessary platform_set_drvdata()
  spi: bcm-qspi: Fix bcm_qspi_bspi_read() performance
  spi: lantiq-ssc: add support for Lantiq SSC SPI controller
  spi: s3c64xx: fix inconsistency between binding and driver
  spi: armada-3700: Remove .owner field for driver
  spi: bcm-qspi: Added mspi read fallback in bcm_qspi_flash_read()
  spi: fix device-node leaks
  spi: mediatek: Only do dma for 4-byte aligned buffers
  spi: When no dma_chan map buffers with spi_master's parent
  spi: pca2xx-pci: Allow MSI
  spi: pxa2xx: Prepare for edge-triggered interrupts
  spi: pxa2xx: Add support for Intel Gemini Lake
  ...
parents f790bd9c 57f22cd2

Documentation/devicetree/bindings/spi/spi-lantiq-ssc.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
Lantiq Synchronous Serial Controller (SSC) SPI master driver



Required properties:

- compatible: "lantiq,ase-spi", "lantiq,falcon-spi", "lantiq,xrx100-spi"

- #address-cells: see spi-bus.txt

- #size-cells: see spi-bus.txt

- reg: address and length of the spi master registers

- interrupts: should contain the "spi_rx", "spi_tx" and "spi_err" interrupt.





Optional properties:

- clocks: spi clock phandle

- num-cs: see spi-bus.txt, set to 8 if unset

- base-cs: the number of the first chip select, set to 1 if unset.



Example:





spi: spi@E100800 {

	compatible = "lantiq,xrx200-spi", "lantiq,xrx100-spi";

	reg = <0xE100800 0x100>;

	interrupt-parent = <&icu0>;

	interrupts = <22 23 24>;

	interrupt-names = "spi_rx", "spi_tx", "spi_err";

	#address-cells = <1>;

	#size-cells = <1>;

	num-cs = <6>;

	base-cs = <1>;

};

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

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ Optional Properties: 
- rx-sample-delay-ns: nanoseconds to delay after the SCLK edge before sampling

		Rx data (may need to be fine tuned for high capacitance lines).

		No delay (0) by default.

- pinctrl-names: Names for the pin configuration(s); may be "default" or

		"sleep", where the "sleep" configuration may describe the state

		the pins should be in during system suspend. See also

		pinctrl/pinctrl-bindings.txt.





Example:
@@ -46,4 +50,7 @@ Example: 
		interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_SPI0>, <&cru PCLK_SPI0>;

		clock-names = "spiclk", "apb_pclk";

		pinctrl-0 = <&spi1_pins>;

		pinctrl-1 = <&spi1_sleep>;

		pinctrl-names = "default", "sleep";

	};

Documentation/spi/ep93xx_spi

deleted100644 → 0
+0 −105
Original line number Diff line number Diff line 
Cirrus EP93xx SPI controller driver HOWTO

=========================================



ep93xx_spi driver brings SPI master support for EP93xx SPI controller.  Chip

selects are implemented with GPIO lines.



NOTE: If possible, don't use SFRMOUT (SFRM1) signal as a chip select. It will

not work correctly (it cannot be controlled by software). Use GPIO lines

instead.



Sample configuration

====================



Typically driver configuration is done in platform board files (the files under

arch/arm/mach-ep93xx/*.c). In this example we configure MMC over SPI through

this driver on TS-7260 board. You can adapt the code to suit your needs.



This example uses EGPIO9 as SD/MMC card chip select (this is wired in DIO1

header on the board).



You need to select CONFIG_MMC_SPI to use mmc_spi driver.



arch/arm/mach-ep93xx/ts72xx.c:



...

#include <linux/gpio.h>

#include <linux/spi/spi.h>



#include <linux/platform_data/spi-ep93xx.h>



/* this is our GPIO line used for chip select */

#define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO9



static int ts72xx_mmc_spi_setup(struct spi_device *spi)

{

	int err;



	err = gpio_request(MMC_CHIP_SELECT_GPIO, spi->modalias);

	if (err)

		return err;



	gpio_direction_output(MMC_CHIP_SELECT_GPIO, 1);



	return 0;

}



static void ts72xx_mmc_spi_cleanup(struct spi_device *spi)

{

	gpio_set_value(MMC_CHIP_SELECT_GPIO, 1);

	gpio_direction_input(MMC_CHIP_SELECT_GPIO);

	gpio_free(MMC_CHIP_SELECT_GPIO);

}



static void ts72xx_mmc_spi_cs_control(struct spi_device *spi, int value)

{

	gpio_set_value(MMC_CHIP_SELECT_GPIO, value);

}



static struct ep93xx_spi_chip_ops ts72xx_mmc_spi_ops = {

	.setup		= ts72xx_mmc_spi_setup,

	.cleanup	= ts72xx_mmc_spi_cleanup,

	.cs_control	= ts72xx_mmc_spi_cs_control,

};



static struct spi_board_info ts72xx_spi_devices[] __initdata = {

	{

		.modalias		= "mmc_spi",

		.controller_data	= &ts72xx_mmc_spi_ops,

		/*

		 * We use 10 MHz even though the maximum is 7.4 MHz. The driver

		 * will limit it automatically to max. frequency.

		 */

		.max_speed_hz		= 10 * 1000 * 1000,

		.bus_num		= 0,

		.chip_select		= 0,

		.mode			= SPI_MODE_0,

	},

};



static struct ep93xx_spi_info ts72xx_spi_info = {

	.num_chipselect	= ARRAY_SIZE(ts72xx_spi_devices),

};



static void __init ts72xx_init_machine(void)

{

	...

	ep93xx_register_spi(&ts72xx_spi_info, ts72xx_spi_devices,

			    ARRAY_SIZE(ts72xx_spi_devices));

}



The driver can use DMA for the transfers also. In this case ts72xx_spi_info

becomes:



static struct ep93xx_spi_info ts72xx_spi_info = {

	.num_chipselect	= ARRAY_SIZE(ts72xx_spi_devices),

	.use_dma	= true;

};



Note that CONFIG_EP93XX_DMA should be enabled as well.



Thanks to

=========

Martin Guy, H. Hartley Sweeten and others who helped me during development of

the driver. Simplemachines.it donated me a Sim.One board which I used testing

the driver on EP9307.

arch/arm/mach-ep93xx/edb93xx.c

+6 −25
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/gpio.h>

#include <linux/i2c.h>

#include <linux/i2c-gpio.h>

#include <linux/spi/spi.h>
@@ -106,33 +105,10 @@ static struct cs4271_platform_data edb93xx_cs4271_data = { 
	.gpio_nreset	= -EINVAL,	/* filled in later */

};



static int edb93xx_cs4271_hw_setup(struct spi_device *spi)

{

	return gpio_request_one(EP93XX_GPIO_LINE_EGPIO6,

				GPIOF_OUT_INIT_HIGH, spi->modalias);

}



static void edb93xx_cs4271_hw_cleanup(struct spi_device *spi)

{

	gpio_free(EP93XX_GPIO_LINE_EGPIO6);

}



static void edb93xx_cs4271_hw_cs_control(struct spi_device *spi, int value)

{

	gpio_set_value(EP93XX_GPIO_LINE_EGPIO6, value);

}



static struct ep93xx_spi_chip_ops edb93xx_cs4271_hw = {

	.setup		= edb93xx_cs4271_hw_setup,

	.cleanup	= edb93xx_cs4271_hw_cleanup,

	.cs_control	= edb93xx_cs4271_hw_cs_control,

};



static struct spi_board_info edb93xx_spi_board_info[] __initdata = {

	{

		.modalias		= "cs4271",

		.platform_data		= &edb93xx_cs4271_data,

		.controller_data	= &edb93xx_cs4271_hw,

		.max_speed_hz		= 6000000,

		.bus_num		= 0,

		.chip_select		= 0,
@@ -140,8 +116,13 @@ static struct spi_board_info edb93xx_spi_board_info[] __initdata = { 
	},

};



static int edb93xx_spi_chipselects[] __initdata = {

	EP93XX_GPIO_LINE_EGPIO6,

};



static struct ep93xx_spi_info edb93xx_spi_info __initdata = {

	.num_chipselect	= ARRAY_SIZE(edb93xx_spi_board_info),

	.chipselect	= edb93xx_spi_chipselects,

	.num_chipselect	= ARRAY_SIZE(edb93xx_spi_chipselects),

};



static void __init edb93xx_register_spi(void)

arch/arm/mach-ep93xx/simone.c

+11 −52
Original line number Diff line number Diff line
@@ -48,56 +48,6 @@ static struct ep93xxfb_mach_info __initdata simone_fb_info = { 
 */

#define MMC_CARD_DETECT_GPIO EP93XX_GPIO_LINE_EGPIO0



/*

 * Up to v1.3, the Sim.One used SFRMOUT as SD card chip select, but this goes

 * low between multi-message command blocks. From v1.4, it uses a GPIO instead.

 * v1.3 parts will still work, since the signal on SFRMOUT is automatic.

 */

#define MMC_CHIP_SELECT_GPIO EP93XX_GPIO_LINE_EGPIO1



/*

 * MMC SPI chip select GPIO handling. If you are using SFRMOUT (SFRM1) signal,

 * you can leave these empty and pass NULL as .controller_data.

 */



static int simone_mmc_spi_setup(struct spi_device *spi)

{

	unsigned int gpio = MMC_CHIP_SELECT_GPIO;

	int err;



	err = gpio_request(gpio, spi->modalias);

	if (err)

		return err;



	err = gpio_direction_output(gpio, 1);

	if (err) {

		gpio_free(gpio);

		return err;

	}



	return 0;

}



static void simone_mmc_spi_cleanup(struct spi_device *spi)

{

	unsigned int gpio = MMC_CHIP_SELECT_GPIO;



	gpio_set_value(gpio, 1);

	gpio_direction_input(gpio);

	gpio_free(gpio);

}



static void simone_mmc_spi_cs_control(struct spi_device *spi, int value)

{

	gpio_set_value(MMC_CHIP_SELECT_GPIO, value);

}



static struct ep93xx_spi_chip_ops simone_mmc_spi_ops = {

	.setup		= simone_mmc_spi_setup,

	.cleanup	= simone_mmc_spi_cleanup,

	.cs_control	= simone_mmc_spi_cs_control,

};



/*

 * MMC card detection GPIO setup.

 */
@@ -152,7 +102,6 @@ static struct mmc_spi_platform_data simone_mmc_spi_data = { 
static struct spi_board_info simone_spi_devices[] __initdata = {

	{

		.modalias		= "mmc_spi",

		.controller_data	= &simone_mmc_spi_ops,

		.platform_data		= &simone_mmc_spi_data,

		/*

		 * We use 10 MHz even though the maximum is 3.7 MHz. The driver
@@ -165,8 +114,18 @@ static struct spi_board_info simone_spi_devices[] __initdata = { 
	},

};



/*

 * Up to v1.3, the Sim.One used SFRMOUT as SD card chip select, but this goes

 * low between multi-message command blocks. From v1.4, it uses a GPIO instead.

 * v1.3 parts will still work, since the signal on SFRMOUT is automatic.

 */

static int simone_spi_chipselects[] __initdata = {

	EP93XX_GPIO_LINE_EGPIO1,

};



static struct ep93xx_spi_info simone_spi_info __initdata = {

	.num_chipselect	= ARRAY_SIZE(simone_spi_devices),

	.chipselect	= simone_spi_chipselects,

	.num_chipselect	= ARRAY_SIZE(simone_spi_chipselects),

	.use_dma = 1,

};