Merge branch 'devicetree/next' into spi/next

This commit is contained in:
Grant Likely 2011-01-14 12:09:49 -07:00
commit 42a9fa9957
3038 changed files with 188591 additions and 88098 deletions

View file

@ -341,9 +341,9 @@ static void atmel_spi_next_message(struct spi_master *master)
/*
* For DMA, tx_buf/tx_dma have the same relationship as rx_buf/rx_dma:
* - The buffer is either valid for CPU access, else NULL
* - If the buffer is valid, so is its DMA addresss
* - If the buffer is valid, so is its DMA address
*
* This driver manages the dma addresss unless message->is_dma_mapped.
* This driver manages the dma address unless message->is_dma_mapped.
*/
static int
atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer)

View file

@ -38,7 +38,7 @@
/*
* This supports acccess to SPI devices using normal userspace I/O calls.
* This supports access to SPI devices using normal userspace I/O calls.
* Note that while traditional UNIX/POSIX I/O semantics are half duplex,
* and often mask message boundaries, full SPI support requires full duplex
* transfers. There are several kinds of internal message boundaries to