Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull OMAP3 updates from Mauro Carvalho Chehab: "Some driver improvements on OMAP3. This series depend on some iommu patches already merged" * 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (26 commits) [media] omap3isp: Rename isp_buffer isp_addr field to dma [media] omap3isp: Move to videobuf2 [media] v4l: vb2: Add a function to discard all DONE buffers [media] omap3isp: Cancel all queued buffers when stopping the video stream [media] omap3isp: Move buffer irqlist to isp_buffer structure [media] omap3isp: Move queue irqlock to isp_video structure [media] omap3isp: Move queue mutex to isp_video structure [media] omap3isp: queue: Don't build scatterlist for kernel buffer [media] omap3isp: Use the ARM DMA IOMMU-aware operations [media] omap3isp: queue: Use sg_alloc_table_from_pages() [media] omap3isp: queue: Map PFNMAP buffers to device [media] omap3isp: queue: Fix the dma_map_sg() return value check [media] omap3isp: queue: Allocate kernel buffers with dma_alloc_coherent [media] omap3isp: queue: Inline the ispmmu_v(un)map functions [media] omap3isp: queue: Merge the prepare and sglist functions [media] omap3isp: queue: Use sg_table structure [media] omap3isp: queue: Move IOMMU handling code to the queue [media] omap3isp: video: Set the buffer bytesused field at completion time [media] omap3isp: ccdc: Use the DMA API for FPC [media] omap3isp: ccdc: Use the DMA API for LSC ...
Showing
- drivers/media/platform/Kconfig 3 additions, 1 deletiondrivers/media/platform/Kconfig
- drivers/media/platform/omap3isp/Makefile 1 addition, 1 deletiondrivers/media/platform/omap3isp/Makefile
- drivers/media/platform/omap3isp/isp.c 79 additions, 29 deletionsdrivers/media/platform/omap3isp/isp.c
- drivers/media/platform/omap3isp/isp.h 3 additions, 5 deletionsdrivers/media/platform/omap3isp/isp.h
- drivers/media/platform/omap3isp/ispccdc.c 53 additions, 54 deletionsdrivers/media/platform/omap3isp/ispccdc.c
- drivers/media/platform/omap3isp/ispccdc.h 13 additions, 3 deletionsdrivers/media/platform/omap3isp/ispccdc.h
- drivers/media/platform/omap3isp/ispccp2.c 2 additions, 2 deletionsdrivers/media/platform/omap3isp/ispccp2.c
- drivers/media/platform/omap3isp/ispcsi2.c 2 additions, 2 deletionsdrivers/media/platform/omap3isp/ispcsi2.c
- drivers/media/platform/omap3isp/isph3a_aewb.c 1 addition, 1 deletiondrivers/media/platform/omap3isp/isph3a_aewb.c
- drivers/media/platform/omap3isp/isph3a_af.c 1 addition, 1 deletiondrivers/media/platform/omap3isp/isph3a_af.c
- drivers/media/platform/omap3isp/isppreview.c 4 additions, 4 deletionsdrivers/media/platform/omap3isp/isppreview.c
- drivers/media/platform/omap3isp/ispqueue.c 0 additions, 1161 deletionsdrivers/media/platform/omap3isp/ispqueue.c
- drivers/media/platform/omap3isp/ispqueue.h 0 additions, 188 deletionsdrivers/media/platform/omap3isp/ispqueue.h
- drivers/media/platform/omap3isp/ispresizer.c 4 additions, 4 deletionsdrivers/media/platform/omap3isp/ispresizer.c
- drivers/media/platform/omap3isp/ispstat.c 83 additions, 114 deletionsdrivers/media/platform/omap3isp/ispstat.c
- drivers/media/platform/omap3isp/ispstat.h 1 addition, 2 deletionsdrivers/media/platform/omap3isp/ispstat.h
- drivers/media/platform/omap3isp/ispvideo.c 167 additions, 158 deletionsdrivers/media/platform/omap3isp/ispvideo.c
- drivers/media/platform/omap3isp/ispvideo.h 15 additions, 14 deletionsdrivers/media/platform/omap3isp/ispvideo.h
- drivers/media/v4l2-core/videobuf2-core.c 24 additions, 0 deletionsdrivers/media/v4l2-core/videobuf2-core.c
- drivers/staging/media/omap4iss/iss_video.c 1 addition, 1 deletiondrivers/staging/media/omap4iss/iss_video.c
Loading
Please register or sign in to comment