diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2010-12-27 12:42:15 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-21 19:31:38 -0400 |
commit | df7e09a351199ad9a70eb9ae3b072cc4fc59a9bb (patch) | |
tree | 10f13ac25df04a343f4cca9e0cd9b2f67bda3e87 /drivers/media/video/s5p-fimc/fimc-reg.c | |
parent | 8293ebfce2053242e30069e65427e7560aff1fee (diff) |
[media] s5p-fimc: Rename s3c_fimc* to s5p_fimc*
Change s3c_fimc.h header file name to s5p_fimc.h, replace s3c_fimc_*
names with s5p_fimc_*. s3c_fimc need to be reserved for S3C series
and s5p-fimc driver will not cover CAMIF devices in S3C SoC series.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-fimc/fimc-reg.c')
-rw-r--r-- | drivers/media/video/s5p-fimc/fimc-reg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c index 5ed8f06ca015..ae33bc1c7bd4 100644 --- a/drivers/media/video/s5p-fimc/fimc-reg.c +++ b/drivers/media/video/s5p-fimc/fimc-reg.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
14 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
15 | #include <mach/map.h> | 15 | #include <mach/map.h> |
16 | #include <media/s3c_fimc.h> | 16 | #include <media/s5p_fimc.h> |
17 | 17 | ||
18 | #include "fimc-core.h" | 18 | #include "fimc-core.h" |
19 | 19 | ||
@@ -532,7 +532,7 @@ void fimc_hw_set_output_addr(struct fimc_dev *dev, | |||
532 | } | 532 | } |
533 | 533 | ||
534 | int fimc_hw_set_camera_polarity(struct fimc_dev *fimc, | 534 | int fimc_hw_set_camera_polarity(struct fimc_dev *fimc, |
535 | struct s3c_fimc_isp_info *cam) | 535 | struct s5p_fimc_isp_info *cam) |
536 | { | 536 | { |
537 | u32 cfg = readl(fimc->regs + S5P_CIGCTRL); | 537 | u32 cfg = readl(fimc->regs + S5P_CIGCTRL); |
538 | 538 | ||
@@ -557,7 +557,7 @@ int fimc_hw_set_camera_polarity(struct fimc_dev *fimc, | |||
557 | } | 557 | } |
558 | 558 | ||
559 | int fimc_hw_set_camera_source(struct fimc_dev *fimc, | 559 | int fimc_hw_set_camera_source(struct fimc_dev *fimc, |
560 | struct s3c_fimc_isp_info *cam) | 560 | struct s5p_fimc_isp_info *cam) |
561 | { | 561 | { |
562 | struct fimc_frame *f = &fimc->vid_cap.ctx->s_frame; | 562 | struct fimc_frame *f = &fimc->vid_cap.ctx->s_frame; |
563 | u32 cfg = 0; | 563 | u32 cfg = 0; |
@@ -624,7 +624,7 @@ int fimc_hw_set_camera_offset(struct fimc_dev *fimc, struct fimc_frame *f) | |||
624 | } | 624 | } |
625 | 625 | ||
626 | int fimc_hw_set_camera_type(struct fimc_dev *fimc, | 626 | int fimc_hw_set_camera_type(struct fimc_dev *fimc, |
627 | struct s3c_fimc_isp_info *cam) | 627 | struct s5p_fimc_isp_info *cam) |
628 | { | 628 | { |
629 | u32 cfg, tmp; | 629 | u32 cfg, tmp; |
630 | struct fimc_vid_cap *vid_cap = &fimc->vid_cap; | 630 | struct fimc_vid_cap *vid_cap = &fimc->vid_cap; |