diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 17:34:59 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 17:34:59 +1100 |
commit | 059ee860ad4b7aaa04d918ae2b048edeae166923 (patch) | |
tree | fc8114c3a99009637d1f8a534da754a9dddf068e /include | |
parent | 5ef2b7eec19c05fa7602cb48a303c657339107b6 (diff) | |
parent | b5c2ce00ddaeb0f683d5d7363817deed632740fd (diff) |
Merge remote branch 'spi/next-spi'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/spi/mpc52xx_spi.h | 10 | ||||
-rw-r--r-- | include/linux/spi/xilinx_spi.h | 20 |
2 files changed, 20 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 @@ - -#ifndef INCLUDE_MPC5200_SPI_H -#define INCLUDE_MPC5200_SPI_H - -extern void mpc52xx_spi_set_premessage_hook(struct spi_master *master, - void (*hook)(struct spi_message *m, - void *context), - void *hook_context); - -#endif 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 @@ +#ifndef __LINUX_SPI_XILINX_SPI_H +#define __LINUX_SPI_XILINX_SPI_H + +/** + * struct xspi_platform_data - Platform data of the Xilinx SPI driver + * @num_chipselect: Number of chip select by the IP. + * @little_endian: If registers should be accessed little endian or not. + * @bits_per_word: Number of bits per word. + * @devices: Devices to add when the driver is probed. + * @num_devices: Number of devices in the devices array. + */ +struct xspi_platform_data { + u16 num_chipselect; + bool little_endian; + u8 bits_per_word; + struct spi_board_info *devices; + u8 num_devices; +}; + +#endif /* __LINUX_SPI_XILINX_SPI_H */ |