diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-29 01:05:14 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-29 01:05:50 -0700 |
| commit | 94a544a4e8d05a027613443c529c399c39cc3371 (patch) | |
| tree | edada38e93a958a918b5826eaef173b1b92079d1 /Documentation | |
| parent | 496a2e360a34e1f41c336d23947f800216cb9bdf (diff) | |
| parent | 21486af0f34d03b813b023d7a2b887b329f60486 (diff) | |
| download | kernel_samsung_smdk4412-94a544a4e8d05a027613443c529c399c39cc3371.zip kernel_samsung_smdk4412-94a544a4e8d05a027613443c529c399c39cc3371.tar.gz kernel_samsung_smdk4412-94a544a4e8d05a027613443c529c399c39cc3371.tar.bz2 | |
Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
* 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next
spi/pxa2xx: register driver properly
spi/pxa2xx: add support for shared IRQ handler
spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers
arm/pxa2xx: reorgazine SSP and SPI header files
spi/pxa2xx: Add CE4100 support
spi/pxa2xx: Consider CE4100's FIFO depth
spi/pxa2xx: Add chipselect support for Sodaville
spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
spi/pxa2xx: pass of_node to spi device and set a parent device
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/spi/pxa2xx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/spi/pxa2xx b/Documentation/spi/pxa2xx index 6bb916d..68a4fe3 100644 --- a/Documentation/spi/pxa2xx +++ b/Documentation/spi/pxa2xx @@ -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. |