diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-12-14 06:37:02 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-12-14 06:37:02 +0300 |
| commit | 57fb7ee10c27b315600445b2bad72236a11951ad (patch) | |
| tree | 9cecbaf35c9fd7f11808bb3f028d60165e2079db /include | |
| parent | 90644ad7f2c0292b1a2a98d733bd17f449bb9885 (diff) | |
| parent | c41668ad5de939855636650d39e961893dc5d6fc (diff) | |
| download | linux-57fb7ee10c27b315600445b2bad72236a11951ad.tar.xz | |
Merge branch 'topic/s3c64xx' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/amba/pl08x.h | 4 | ||||
| -rw-r--r-- | include/linux/platform_data/spi-s3c64xx.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h index 27e9ec8778eb..5308eae9ce35 100644 --- a/include/linux/amba/pl08x.h +++ b/include/linux/amba/pl08x.h @@ -84,6 +84,8 @@ struct pl08x_channel_data { * running any DMA transfer and multiplexing can be recycled * @lli_buses: buses which LLIs can be fetched from: PL08X_AHB1 | PL08X_AHB2 * @mem_buses: buses which memory can be accessed from: PL08X_AHB1 | PL08X_AHB2 + * @slave_map: DMA slave matching table + * @slave_map_len: number of elements in @slave_map */ struct pl08x_platform_data { struct pl08x_channel_data *slave_channels; @@ -93,6 +95,8 @@ struct pl08x_platform_data { void (*put_xfer_signal)(const struct pl08x_channel_data *, int); u8 lli_buses; u8 mem_buses; + const struct dma_slave_map *slave_map; + int slave_map_len; }; #ifdef CONFIG_AMBA_PL08X diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h index 5c1e21c87270..da79774078a7 100644 --- a/include/linux/platform_data/spi-s3c64xx.h +++ b/include/linux/platform_data/spi-s3c64xx.h @@ -40,9 +40,6 @@ struct s3c64xx_spi_info { int num_cs; bool no_cs; int (*cfg_gpio)(void); - dma_filter_fn filter; - void *dma_tx; - void *dma_rx; }; /** |