Commit 021db8e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
  spi/omap: Fix DMA API usage in OMAP MCSPI driver
  spi/imx: correct the test on platform_get_irq() return value
  spi/topcliff: Typo fix threhold to threshold
  spi/dw_spi Typo change diable to disable.
  spi/fsl_espi: change the read behaviour of the SPIRF
  spi/mpc52xx-psc-spi: move probe/remove to proper sections
  spi/dw_spi: add DMA support
  spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
  spi/dw_spi: Fix too short timeout in spi polling loop
  spi/pl022: convert running variable
  spi/pl022: convert busy flag to a bool
  spi/pl022: pass the returned sglen to the DMA engine
  spi/pl022: map the buffers on the DMA engine
  spi/topcliff_pch: Fix data transfer issue
  spi/imx: remove autodetection
  spi/pxa2xx: pass of_node to spi device and set a parent device
  spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
  spi/pxa2xx: Add chipselect support for Sodaville
  spi/pxa2xx: Consider CE4100's FIFO depth
  spi/pxa2xx: Add CE4100 support
  ...
parents 72eb6a79 07fe0351

Documentation/spi/pxa2xx

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Declaring PXA2xx Master Controllers 
-----------------------------------

Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a

"platform device".  The master configuration is passed to the driver via a table

found in arch/arm/mach-pxa/include/mach/pxa2xx_spi.h:

found in include/linux/spi/pxa2xx_spi.h:



struct pxa2xx_spi_master {

	enum pxa_ssp_type ssp_type;
@@ -94,7 +94,7 @@ using the "spi_board_info" structure found in "linux/spi/spi.h". See 


Each slave device attached to the PXA must provide slave specific configuration

information via the structure "pxa2xx_spi_chip" found in

"arch/arm/mach-pxa/include/mach/pxa2xx_spi.h".  The pxa2xx_spi master controller driver

"include/linux/spi/pxa2xx_spi.h".  The pxa2xx_spi master controller driver

will uses the configuration whenever the driver communicates with the slave

device. All fields are optional.

arch/arm/mach-davinci/dm355.c

+1 −6
Original line number Diff line number Diff line
@@ -412,12 +412,7 @@ static struct resource dm355_spi0_resources[] = { 
static struct davinci_spi_platform_data dm355_spi0_pdata = {

	.version 	= SPI_VERSION_1,

	.num_chipselect = 2,

	.clk_internal	= 1,

	.cs_hold	= 1,

	.intr_level	= 0,

	.poll_mode	= 1,	/* 0 -> interrupt mode 1-> polling mode */

	.c2tdelay	= 0,

	.t2cdelay	= 0,

	.cshold_bug	= true,

};

static struct platform_device dm355_spi0_device = {

	.name = "spi_davinci",

arch/arm/mach-davinci/dm365.c

+0 −6
Original line number Diff line number Diff line
@@ -625,12 +625,6 @@ static u64 dm365_spi0_dma_mask = DMA_BIT_MASK(32); 
static struct davinci_spi_platform_data dm365_spi0_pdata = {

	.version 	= SPI_VERSION_1,

	.num_chipselect = 2,

	.clk_internal	= 1,

	.cs_hold	= 1,

	.intr_level	= 0,

	.poll_mode	= 1,	/* 0 -> interrupt mode 1-> polling mode */

	.c2tdelay	= 0,

	.t2cdelay	= 0,

};



static struct resource dm365_spi0_resources[] = {

arch/arm/mach-davinci/include/mach/spi.h

+46 −6
Original line number Diff line number Diff line
@@ -19,26 +19,66 @@ 
#ifndef __ARCH_ARM_DAVINCI_SPI_H

#define __ARCH_ARM_DAVINCI_SPI_H



#define SPI_INTERN_CS	0xFF



enum {

	SPI_VERSION_1, /* For DM355/DM365/DM6467 */

	SPI_VERSION_2, /* For DA8xx */

};



/**

 * davinci_spi_platform_data - Platform data for SPI master device on DaVinci

 *

 * @version:	version of the SPI IP. Different DaVinci devices have slightly

 *		varying versions of the same IP.

 * @num_chipselect: number of chipselects supported by this SPI master

 * @intr_line:	interrupt line used to connect the SPI IP to the ARM interrupt

 *		controller withn the SoC. Possible values are 0 and 1.

 * @chip_sel:	list of GPIOs which can act as chip-selects for the SPI.

 *		SPI_INTERN_CS denotes internal SPI chip-select. Not necessary

 *		to populate if all chip-selects are internal.

 * @cshold_bug:	set this to true if the SPI controller on your chip requires

 *		a write to CSHOLD bit in between transfers (like in DM355).

 */

struct davinci_spi_platform_data {

	u8	version;

	u8	num_chipselect;

	u8	intr_line;

	u8	*chip_sel;

	bool	cshold_bug;

};



/**

 * davinci_spi_config - Per-chip-select configuration for SPI slave devices

 *

 * @wdelay:	amount of delay between transmissions. Measured in number of

 *		SPI module clocks.

 * @odd_parity:	polarity of parity flag at the end of transmit data stream.

 *		0 - odd parity, 1 - even parity.

 * @parity_enable: enable transmission of parity at end of each transmit

 *		data stream.

 * @io_type:	type of IO transfer. Choose between polled, interrupt and DMA.

 * @timer_disable: disable chip-select timers (setup and hold)

 * @c2tdelay:	chip-select setup time. Measured in number of SPI module clocks.

 * @t2cdelay:	chip-select hold time. Measured in number of SPI module clocks.

 * @t2edelay:	transmit data finished to SPI ENAn pin inactive time. Measured

 *		in number of SPI clocks.

 * @c2edelay:	chip-select active to SPI ENAn signal active time. Measured in

 *		number of SPI clocks.

 */

struct davinci_spi_config {

	u8	wdelay;

	u8	odd_parity;

	u8	parity_enable;

	u8	wait_enable;

#define SPI_IO_TYPE_INTR	0

#define SPI_IO_TYPE_POLL	1

#define SPI_IO_TYPE_DMA		2

	u8	io_type;

	u8	timer_disable;

	u8	clk_internal;

	u8	cs_hold;

	u8	intr_level;

	u8	poll_mode;

	u8	use_dma;

	u8	c2tdelay;

	u8	t2cdelay;

	u8	t2edelay;

	u8	c2edelay;

};



#endif	/* __ARCH_ARM_DAVINCI_SPI_H */

arch/arm/mach-pxa/cm-x255.c

+1 −1
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
#include <linux/mtd/nand-gpio.h>



#include <linux/spi/spi.h>

#include <linux/spi/pxa2xx_spi.h>



#include <asm/mach/arch.h>

#include <asm/mach-types.h>

#include <asm/mach/map.h>



#include <mach/pxa25x.h>

#include <mach/pxa2xx_spi.h>



#include "generic.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE