Merge remote-tracking branches 'spi/topic/overlay', 'spi/topic/pxa2xx', 'spi/topic/s3c64xx', 'spi/topic/sh-msiof' and 'spi/topic/spidev' into spi-next

2016-01-11 16:48:35 +00:00 · 2016-01-11 16:48:35 +00:00 · 4f9530705b
commit 4f9530705b
parent 41d5a70051 bd6c1644a2 d599af65fd cc023478dc ec7f9eb4be edd3899c8c
16 changed files with 160 additions and 80 deletions
--- a/include/linux/platform_data/spi-s3c64xx.h
+++ b/include/linux/platform_data/spi-s3c64xx.h
@ -40,6 +40,8 @@ struct s3c64xx_spi_info {
 	int num_cs;
 	int (*cfg_gpio)(void);
 	dma_filter_fn filter;
+	void *dma_tx;
+	void *dma_rx;
 };

 /**