xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'spi/topic/devprop', 'spi/topic/fsl', 'spi/topic/fsl-dspi', 'spi/topic/imx' and 'spi/topic/lantiq' into spi-next

Browse Source
This commit is contained in:
Mark Brown
2017-04-26 15:58:04 +01:00
parent 2536374352 f974cf57b1 500a32abaf fbad6c2439 f72efa7e69 a5b0443c9b
commit a2d5eda072
7 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/spi/spi.h
View File

@@ -23,6 +23,7 @@
#include <linux/scatterlist.h>
struct dma_chan;
struct property_entry;
struct spi_master;
struct spi_transfer;
struct spi_flash_read_message;
@@ -1209,6 +1210,7 @@ int spi_flash_read(struct spi_device *spi,
* @modalias: Initializes spi_device.modalias; identifies the driver.
* @platform_data: Initializes spi_device.platform_data; the particular
* data stored there is driver-specific.
* @properties: Additional device properties for the device.
* @controller_data: Initializes spi_device.controller_data; some
* controllers need hints about hardware setup, e.g. for DMA.
* @irq: Initializes spi_device.irq; depends on how the board is wired.
@@ -1241,10 +1243,12 @@ struct spi_board_info {
*
* platform_data goes to spi_device.dev.platform_data,
* controller_data goes to spi_device.controller_data,
* device properties are copied and attached to spi_device,
* irq is copied too
*/
char modalias[SPI_NAME_SIZE];
const void *platform_data;
const struct property_entry *properties;
void *controller_data;
int irq;