diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2011-07-27 20:43:21 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-07-27 20:43:21 +0530 |
| commit | 1ae105aa7416087f2920c35c3cd16831d0d09c9c (patch) | |
| tree | 935b2d7c2b902f77b37e38ec9108f905fb09f690 /include/linux/amba | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
| parent | 5a42fb93e6a33224774786691027ef2d9795c245 (diff) | |
| download | op-kernel-dev-1ae105aa7416087f2920c35c3cd16831d0d09c9c.zip op-kernel-dev-1ae105aa7416087f2920c35c3cd16831d0d09c9c.tar.gz | |
Merge branch 'next' into for-linus-3.0
Diffstat (limited to 'include/linux/amba')
| -rw-r--r-- | include/linux/amba/pl08x.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/amba/pl08x.h b/include/linux/amba/pl08x.h index 3111385..e6e28f3 100644 --- a/include/linux/amba/pl08x.h +++ b/include/linux/amba/pl08x.h @@ -172,8 +172,11 @@ struct pl08x_dma_chan { int phychan_hold; struct tasklet_struct tasklet; char *name; - struct pl08x_channel_data *cd; - dma_addr_t runtime_addr; + const struct pl08x_channel_data *cd; + dma_addr_t src_addr; + dma_addr_t dst_addr; + u32 src_cctl; + u32 dst_cctl; enum dma_data_direction runtime_direction; dma_cookie_t lc; struct list_head pend_list; @@ -202,7 +205,7 @@ struct pl08x_dma_chan { * @mem_buses: buses which memory can be accessed from: PL08X_AHB1 | PL08X_AHB2 */ struct pl08x_platform_data { - struct pl08x_channel_data *slave_channels; + const struct pl08x_channel_data *slave_channels; unsigned int num_slave_channels; struct pl08x_channel_data memcpy_channel; int (*get_signal)(struct pl08x_dma_chan *); |
