diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2014-03-09 19:17:12 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-25 10:40:09 -0400 |
commit | 21d8582d480443574d6a8811e25ccb65dff974d5 (patch) | |
tree | 60e5b43f64ac39cbc8d7404250ed3d7fbeb51332 /drivers/media | |
parent | fbac1400bd1a7a88191dd71442ef2c282ad1816c (diff) |
[media] omap3isp: Rename isp_buffer isp_addr field to dma
No functional changes.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/platform/omap3isp/ispccdc.c | 4 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispccp2.c | 4 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispcsi2.c | 4 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/isppreview.c | 8 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispresizer.c | 8 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispvideo.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/omap3isp/ispvideo.h | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c index 004a4f52d9d7..9f727d20f06d 100644 --- a/drivers/media/platform/omap3isp/ispccdc.c +++ b/drivers/media/platform/omap3isp/ispccdc.c | |||
@@ -1521,7 +1521,7 @@ static int ccdc_isr_buffer(struct isp_ccdc_device *ccdc) | |||
1521 | 1521 | ||
1522 | buffer = omap3isp_video_buffer_next(&ccdc->video_out); | 1522 | buffer = omap3isp_video_buffer_next(&ccdc->video_out); |
1523 | if (buffer != NULL) { | 1523 | if (buffer != NULL) { |
1524 | ccdc_set_outaddr(ccdc, buffer->isp_addr); | 1524 | ccdc_set_outaddr(ccdc, buffer->dma); |
1525 | restart = 1; | 1525 | restart = 1; |
1526 | } | 1526 | } |
1527 | 1527 | ||
@@ -1660,7 +1660,7 @@ static int ccdc_video_queue(struct isp_video *video, struct isp_buffer *buffer) | |||
1660 | if (!(ccdc->output & CCDC_OUTPUT_MEMORY)) | 1660 | if (!(ccdc->output & CCDC_OUTPUT_MEMORY)) |
1661 | return -ENODEV; | 1661 | return -ENODEV; |
1662 | 1662 | ||
1663 | ccdc_set_outaddr(ccdc, buffer->isp_addr); | 1663 | ccdc_set_outaddr(ccdc, buffer->dma); |
1664 | 1664 | ||
1665 | /* We now have a buffer queued on the output, restart the pipeline | 1665 | /* We now have a buffer queued on the output, restart the pipeline |
1666 | * on the next CCDC interrupt if running in continuous mode (or when | 1666 | * on the next CCDC interrupt if running in continuous mode (or when |
diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c index b30b67d22a58..f3801db9095c 100644 --- a/drivers/media/platform/omap3isp/ispccp2.c +++ b/drivers/media/platform/omap3isp/ispccp2.c | |||
@@ -549,7 +549,7 @@ static void ccp2_isr_buffer(struct isp_ccp2_device *ccp2) | |||
549 | 549 | ||
550 | buffer = omap3isp_video_buffer_next(&ccp2->video_in); | 550 | buffer = omap3isp_video_buffer_next(&ccp2->video_in); |
551 | if (buffer != NULL) | 551 | if (buffer != NULL) |
552 | ccp2_set_inaddr(ccp2, buffer->isp_addr); | 552 | ccp2_set_inaddr(ccp2, buffer->dma); |
553 | 553 | ||
554 | pipe->state |= ISP_PIPELINE_IDLE_INPUT; | 554 | pipe->state |= ISP_PIPELINE_IDLE_INPUT; |
555 | 555 | ||
@@ -940,7 +940,7 @@ static int ccp2_video_queue(struct isp_video *video, struct isp_buffer *buffer) | |||
940 | { | 940 | { |
941 | struct isp_ccp2_device *ccp2 = &video->isp->isp_ccp2; | 941 | struct isp_ccp2_device *ccp2 = &video->isp->isp_ccp2; |
942 | 942 | ||
943 | ccp2_set_inaddr(ccp2, buffer->isp_addr); | 943 | ccp2_set_inaddr(ccp2, buffer->dma); |
944 | return 0; | 944 | return 0; |
945 | } | 945 | } |
946 | 946 | ||
diff --git a/drivers/media/platform/omap3isp/ispcsi2.c b/drivers/media/platform/omap3isp/ispcsi2.c index 620560828a48..5a2e47e58b84 100644 --- a/drivers/media/platform/omap3isp/ispcsi2.c +++ b/drivers/media/platform/omap3isp/ispcsi2.c | |||
@@ -695,7 +695,7 @@ static void csi2_isr_buffer(struct isp_csi2_device *csi2) | |||
695 | if (buffer == NULL) | 695 | if (buffer == NULL) |
696 | return; | 696 | return; |
697 | 697 | ||
698 | csi2_set_outaddr(csi2, buffer->isp_addr); | 698 | csi2_set_outaddr(csi2, buffer->dma); |
699 | csi2_ctx_enable(isp, csi2, 0, 1); | 699 | csi2_ctx_enable(isp, csi2, 0, 1); |
700 | } | 700 | } |
701 | 701 | ||
@@ -812,7 +812,7 @@ static int csi2_queue(struct isp_video *video, struct isp_buffer *buffer) | |||
812 | struct isp_device *isp = video->isp; | 812 | struct isp_device *isp = video->isp; |
813 | struct isp_csi2_device *csi2 = &isp->isp_csi2a; | 813 | struct isp_csi2_device *csi2 = &isp->isp_csi2a; |
814 | 814 | ||
815 | csi2_set_outaddr(csi2, buffer->isp_addr); | 815 | csi2_set_outaddr(csi2, buffer->dma); |
816 | 816 | ||
817 | /* | 817 | /* |
818 | * If streaming was enabled before there was a buffer queued | 818 | * If streaming was enabled before there was a buffer queued |
diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c index 395b2b068c75..720809b07e75 100644 --- a/drivers/media/platform/omap3isp/isppreview.c +++ b/drivers/media/platform/omap3isp/isppreview.c | |||
@@ -1499,14 +1499,14 @@ static void preview_isr_buffer(struct isp_prev_device *prev) | |||
1499 | if (prev->input == PREVIEW_INPUT_MEMORY) { | 1499 | if (prev->input == PREVIEW_INPUT_MEMORY) { |
1500 | buffer = omap3isp_video_buffer_next(&prev->video_in); | 1500 | buffer = omap3isp_video_buffer_next(&prev->video_in); |
1501 | if (buffer != NULL) | 1501 | if (buffer != NULL) |
1502 | preview_set_inaddr(prev, buffer->isp_addr); | 1502 | preview_set_inaddr(prev, buffer->dma); |
1503 | pipe->state |= ISP_PIPELINE_IDLE_INPUT; | 1503 | pipe->state |= ISP_PIPELINE_IDLE_INPUT; |
1504 | } | 1504 | } |
1505 | 1505 | ||
1506 | if (prev->output & PREVIEW_OUTPUT_MEMORY) { | 1506 | if (prev->output & PREVIEW_OUTPUT_MEMORY) { |
1507 | buffer = omap3isp_video_buffer_next(&prev->video_out); | 1507 | buffer = omap3isp_video_buffer_next(&prev->video_out); |
1508 | if (buffer != NULL) { | 1508 | if (buffer != NULL) { |
1509 | preview_set_outaddr(prev, buffer->isp_addr); | 1509 | preview_set_outaddr(prev, buffer->dma); |
1510 | restart = 1; | 1510 | restart = 1; |
1511 | } | 1511 | } |
1512 | pipe->state |= ISP_PIPELINE_IDLE_OUTPUT; | 1512 | pipe->state |= ISP_PIPELINE_IDLE_OUTPUT; |
@@ -1577,10 +1577,10 @@ static int preview_video_queue(struct isp_video *video, | |||
1577 | struct isp_prev_device *prev = &video->isp->isp_prev; | 1577 | struct isp_prev_device *prev = &video->isp->isp_prev; |
1578 | 1578 | ||
1579 | if (video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) | 1579 | if (video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) |
1580 | preview_set_inaddr(prev, buffer->isp_addr); | 1580 | preview_set_inaddr(prev, buffer->dma); |
1581 | 1581 | ||
1582 | if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) | 1582 | if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) |
1583 | preview_set_outaddr(prev, buffer->isp_addr); | 1583 | preview_set_outaddr(prev, buffer->dma); |
1584 | 1584 | ||
1585 | return 0; | 1585 | return 0; |
1586 | } | 1586 | } |
diff --git a/drivers/media/platform/omap3isp/ispresizer.c b/drivers/media/platform/omap3isp/ispresizer.c index 86369df81d74..6f077c2377db 100644 --- a/drivers/media/platform/omap3isp/ispresizer.c +++ b/drivers/media/platform/omap3isp/ispresizer.c | |||
@@ -1040,7 +1040,7 @@ static void resizer_isr_buffer(struct isp_res_device *res) | |||
1040 | */ | 1040 | */ |
1041 | buffer = omap3isp_video_buffer_next(&res->video_out); | 1041 | buffer = omap3isp_video_buffer_next(&res->video_out); |
1042 | if (buffer != NULL) { | 1042 | if (buffer != NULL) { |
1043 | resizer_set_outaddr(res, buffer->isp_addr); | 1043 | resizer_set_outaddr(res, buffer->dma); |
1044 | restart = 1; | 1044 | restart = 1; |
1045 | } | 1045 | } |
1046 | 1046 | ||
@@ -1049,7 +1049,7 @@ static void resizer_isr_buffer(struct isp_res_device *res) | |||
1049 | if (res->input == RESIZER_INPUT_MEMORY) { | 1049 | if (res->input == RESIZER_INPUT_MEMORY) { |
1050 | buffer = omap3isp_video_buffer_next(&res->video_in); | 1050 | buffer = omap3isp_video_buffer_next(&res->video_in); |
1051 | if (buffer != NULL) | 1051 | if (buffer != NULL) |
1052 | resizer_set_inaddr(res, buffer->isp_addr); | 1052 | resizer_set_inaddr(res, buffer->dma); |
1053 | pipe->state |= ISP_PIPELINE_IDLE_INPUT; | 1053 | pipe->state |= ISP_PIPELINE_IDLE_INPUT; |
1054 | } | 1054 | } |
1055 | 1055 | ||
@@ -1101,7 +1101,7 @@ static int resizer_video_queue(struct isp_video *video, | |||
1101 | struct isp_res_device *res = &video->isp->isp_res; | 1101 | struct isp_res_device *res = &video->isp->isp_res; |
1102 | 1102 | ||
1103 | if (video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) | 1103 | if (video->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) |
1104 | resizer_set_inaddr(res, buffer->isp_addr); | 1104 | resizer_set_inaddr(res, buffer->dma); |
1105 | 1105 | ||
1106 | /* | 1106 | /* |
1107 | * We now have a buffer queued on the output. Despite what the | 1107 | * We now have a buffer queued on the output. Despite what the |
@@ -1116,7 +1116,7 @@ static int resizer_video_queue(struct isp_video *video, | |||
1116 | * continuous mode or when starting the stream. | 1116 | * continuous mode or when starting the stream. |
1117 | */ | 1117 | */ |
1118 | if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) | 1118 | if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) |
1119 | resizer_set_outaddr(res, buffer->isp_addr); | 1119 | resizer_set_outaddr(res, buffer->dma); |
1120 | 1120 | ||
1121 | return 0; | 1121 | return 0; |
1122 | } | 1122 | } |
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index c4a2f76f8705..e36bac26476c 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c | |||
@@ -374,7 +374,7 @@ static int isp_video_buffer_prepare(struct vb2_buffer *buf) | |||
374 | } | 374 | } |
375 | 375 | ||
376 | vb2_set_plane_payload(&buffer->vb, 0, vfh->format.fmt.pix.sizeimage); | 376 | vb2_set_plane_payload(&buffer->vb, 0, vfh->format.fmt.pix.sizeimage); |
377 | buffer->isp_addr = addr; | 377 | buffer->dma = addr; |
378 | 378 | ||
379 | return 0; | 379 | return 0; |
380 | } | 380 | } |
diff --git a/drivers/media/platform/omap3isp/ispvideo.h b/drivers/media/platform/omap3isp/ispvideo.h index 1015505963a4..7d2e82122ecd 100644 --- a/drivers/media/platform/omap3isp/ispvideo.h +++ b/drivers/media/platform/omap3isp/ispvideo.h | |||
@@ -127,12 +127,12 @@ static inline int isp_pipeline_ready(struct isp_pipeline *pipe) | |||
127 | * struct isp_buffer - ISP video buffer | 127 | * struct isp_buffer - ISP video buffer |
128 | * @vb: videobuf2 buffer | 128 | * @vb: videobuf2 buffer |
129 | * @irqlist: List head for insertion into IRQ queue | 129 | * @irqlist: List head for insertion into IRQ queue |
130 | * @isp_addr: DMA address | 130 | * @dma: DMA address |
131 | */ | 131 | */ |
132 | struct isp_buffer { | 132 | struct isp_buffer { |
133 | struct vb2_buffer vb; | 133 | struct vb2_buffer vb; |
134 | struct list_head irqlist; | 134 | struct list_head irqlist; |
135 | dma_addr_t isp_addr; | 135 | dma_addr_t dma; |
136 | }; | 136 | }; |
137 | 137 | ||
138 | #define to_isp_buffer(buf) container_of(buf, struct isp_buffer, vb) | 138 | #define to_isp_buffer(buf) container_of(buf, struct isp_buffer, vb) |