diff options
Diffstat (limited to 'drivers/media/platform/pxa_camera.c')
| -rw-r--r-- | drivers/media/platform/pxa_camera.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c index 9d3f0cb1d95a..295f34ad1080 100644 --- a/drivers/media/platform/pxa_camera.c +++ b/drivers/media/platform/pxa_camera.c | |||
| @@ -235,6 +235,7 @@ enum pxa_mbus_layout { | |||
| 235 | * stored in memory in the following way: | 235 | * stored in memory in the following way: |
| 236 | * @packing: Type of sample-packing, that has to be used | 236 | * @packing: Type of sample-packing, that has to be used |
| 237 | * @order: Sample order when storing in memory | 237 | * @order: Sample order when storing in memory |
| 238 | * @layout: Planes layout in memory | ||
| 238 | * @bits_per_sample: How many bits the bridge has to sample | 239 | * @bits_per_sample: How many bits the bridge has to sample |
| 239 | */ | 240 | */ |
| 240 | struct pxa_mbus_pixelfmt { | 241 | struct pxa_mbus_pixelfmt { |
| @@ -852,10 +853,10 @@ static void pxa_camera_dma_irq_v(void *data) | |||
| 852 | /** | 853 | /** |
| 853 | * pxa_init_dma_channel - init dma descriptors | 854 | * pxa_init_dma_channel - init dma descriptors |
| 854 | * @pcdev: pxa camera device | 855 | * @pcdev: pxa camera device |
| 855 | * @vb: videobuffer2 buffer | 856 | * @buf: pxa camera buffer |
| 856 | * @dma: dma video buffer | ||
| 857 | * @channel: dma channel (0 => 'Y', 1 => 'U', 2 => 'V') | 857 | * @channel: dma channel (0 => 'Y', 1 => 'U', 2 => 'V') |
| 858 | * @cibr: camera Receive Buffer Register | 858 | * @sg: dma scatter list |
| 859 | * @sglen: dma scatter list length | ||
| 859 | * | 860 | * |
| 860 | * Prepares the pxa dma descriptors to transfer one camera channel. | 861 | * Prepares the pxa dma descriptors to transfer one camera channel. |
| 861 | * | 862 | * |
| @@ -1010,6 +1011,8 @@ static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev, | |||
| 1010 | /** | 1011 | /** |
| 1011 | * pxa_camera_check_link_miss - check missed DMA linking | 1012 | * pxa_camera_check_link_miss - check missed DMA linking |
| 1012 | * @pcdev: camera device | 1013 | * @pcdev: camera device |
| 1014 | * @last_submitted: an opaque DMA cookie for last submitted | ||
| 1015 | * @last_issued: an opaque DMA cookie for last issued | ||
| 1013 | * | 1016 | * |
| 1014 | * The DMA chaining is done with DMA running. This means a tiny temporal window | 1017 | * The DMA chaining is done with DMA running. This means a tiny temporal window |
| 1015 | * remains, where a buffer is queued on the chain, while the chain is already | 1018 | * remains, where a buffer is queued on the chain, while the chain is already |
