diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 13:22:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-14 13:22:11 -0500 |
commit | 478e4e9d7a618379676b17e64583ff3622f2fec5 (patch) | |
tree | 1f25c96499abbb0d0b47f75aa92134209fcc4ee8 /include/linux | |
parent | 2205afa7d13ec716935dfd4b8ff71059ee7aeb0c (diff) | |
parent | 965346e3b99e2c5f51bd1325ddd0257227000355 (diff) |
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (23 commits)
spi: fix probe/remove section markings
Add OMAP spi100k driver
spi-imx: don't access struct device directly but use dev_get_platdata
spi-imx: Add mx25 support
spi-imx: use positive logic to distinguish cpu variants
spi-imx: correct check for platform_get_irq failing
ARM: NUC900: Add spi driver support for nuc900
spi: SuperH MSIOF SPI Master driver V2
spi: fix spidev compilation failure when VERBOSE is defined
spi/au1550_spi: fix setupxfer not to override cfg with zeros
spi/mpc8xxx: don't use __exit_p to wrap plat_mpc8xxx_spi_remove
spi/i.MX: fix broken error handling for gpio_request
spi/i.mx: drain MXC SPI transfer buffer when probing device
MAINTAINERS: add SPI co-maintainer.
spi/xilinx_spi: fix incorrect casting
spi/mpc52xx-spi: minor cleanups
xilinx_spi: add a platform driver using the xilinx_spi common module.
xilinx_spi: add support for the DS570 IP.
xilinx_spi: Switch to iomem functions and support little endian.
xilinx_spi: Split into of driver and generic part.
...
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/spi/mpc52xx_spi.h | 10 | ||||
-rw-r--r-- | include/linux/spi/sh_msiof.h | 10 | ||||
-rw-r--r-- | include/linux/spi/xilinx_spi.h | 20 |
3 files changed, 30 insertions, 10 deletions
diff --git a/include/linux/spi/mpc52xx_spi.h b/include/linux/spi/mpc52xx_spi.h deleted file mode 100644 index d1004cf09241..000000000000 --- a/include/linux/spi/mpc52xx_spi.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | |||
2 | #ifndef INCLUDE_MPC5200_SPI_H | ||
3 | #define INCLUDE_MPC5200_SPI_H | ||
4 | |||
5 | extern void mpc52xx_spi_set_premessage_hook(struct spi_master *master, | ||
6 | void (*hook)(struct spi_message *m, | ||
7 | void *context), | ||
8 | void *hook_context); | ||
9 | |||
10 | #endif | ||
diff --git a/include/linux/spi/sh_msiof.h b/include/linux/spi/sh_msiof.h new file mode 100644 index 000000000000..2e8db3d2d2e5 --- /dev/null +++ b/include/linux/spi/sh_msiof.h | |||
@@ -0,0 +1,10 @@ | |||
1 | #ifndef __SPI_SH_MSIOF_H__ | ||
2 | #define __SPI_SH_MSIOF_H__ | ||
3 | |||
4 | struct sh_msiof_spi_info { | ||
5 | int tx_fifo_override; | ||
6 | int rx_fifo_override; | ||
7 | u16 num_chipselect; | ||
8 | }; | ||
9 | |||
10 | #endif /* __SPI_SH_MSIOF_H__ */ | ||
diff --git a/include/linux/spi/xilinx_spi.h b/include/linux/spi/xilinx_spi.h new file mode 100644 index 000000000000..6f17278810b0 --- /dev/null +++ b/include/linux/spi/xilinx_spi.h | |||
@@ -0,0 +1,20 @@ | |||
1 | #ifndef __LINUX_SPI_XILINX_SPI_H | ||
2 | #define __LINUX_SPI_XILINX_SPI_H | ||
3 | |||
4 | /** | ||
5 | * struct xspi_platform_data - Platform data of the Xilinx SPI driver | ||
6 | * @num_chipselect: Number of chip select by the IP. | ||
7 | * @little_endian: If registers should be accessed little endian or not. | ||
8 | * @bits_per_word: Number of bits per word. | ||
9 | * @devices: Devices to add when the driver is probed. | ||
10 | * @num_devices: Number of devices in the devices array. | ||
11 | */ | ||
12 | struct xspi_platform_data { | ||
13 | u16 num_chipselect; | ||
14 | bool little_endian; | ||
15 | u8 bits_per_word; | ||
16 | struct spi_board_info *devices; | ||
17 | u8 num_devices; | ||
18 | }; | ||
19 | |||
20 | #endif /* __LINUX_SPI_XILINX_SPI_H */ | ||