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. ...
This commit is contained in:
@@ -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
|
10
include/linux/spi/sh_msiof.h
Normal file
10
include/linux/spi/sh_msiof.h
Normal file
@@ -0,0 +1,10 @@
|
||||
#ifndef __SPI_SH_MSIOF_H__
|
||||
#define __SPI_SH_MSIOF_H__
|
||||
|
||||
struct sh_msiof_spi_info {
|
||||
int tx_fifo_override;
|
||||
int rx_fifo_override;
|
||||
u16 num_chipselect;
|
||||
};
|
||||
|
||||
#endif /* __SPI_SH_MSIOF_H__ */
|
20
include/linux/spi/xilinx_spi.h
Normal file
20
include/linux/spi/xilinx_spi.h
Normal file
@@ -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 */
|
Reference in New Issue
Block a user