Merge branch 'spi-5.2' into spi-next

2019-05-02 11:20:29 +09:00
parent 58b860ed4a d61ad23cb3
commit 2e5f081003
55 changed files with 2412 additions and 653 deletions
--- a/include/linux/platform_data/spi-ep93xx.h
+++ b/include/linux/platform_data/spi-ep93xx.h
@@ -6,13 +6,9 @@ struct spi_device;

 /**
 * struct ep93xx_spi_info - EP93xx specific SPI descriptor
- * @chipselect: array of gpio numbers to use as chip selects
- * @num_chipselect: ARRAY_SIZE(chipselect)
 * @use_dma: use DMA for the transfers
 */
 struct ep93xx_spi_info {
-	int	*chipselect;
-	int	num_chipselect;
 	bool	use_dma;
 };