Skip to content

Commit

Permalink
[media] s5p-fimc: Rename s3c_fimc* to s5p_fimc*
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Sylwester Nawrocki authored and Mauro Carvalho Chehab committed Mar 21, 2011
1 parent 8293ebf commit df7e09a
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
16 changes: 8 additions & 8 deletions drivers/media/video/s5p-fimc/fimc-capture.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "fimc-core.h"

static struct v4l2_subdev *fimc_subdev_register(struct fimc_dev *fimc,
struct s3c_fimc_isp_info *isp_info)
struct s5p_fimc_isp_info *isp_info)
{
struct i2c_adapter *i2c_adap;
struct fimc_vid_cap *vid_cap = &fimc->vid_cap;
Expand Down Expand Up @@ -86,8 +86,8 @@ static void fimc_subdev_unregister(struct fimc_dev *fimc)
static int fimc_subdev_attach(struct fimc_dev *fimc, int index)
{
struct fimc_vid_cap *vid_cap = &fimc->vid_cap;
struct s3c_platform_fimc *pdata = fimc->pdata;
struct s3c_fimc_isp_info *isp_info;
struct s5p_platform_fimc *pdata = fimc->pdata;
struct s5p_fimc_isp_info *isp_info;
struct v4l2_subdev *sd;
int i;

Expand Down Expand Up @@ -115,7 +115,7 @@ static int fimc_subdev_attach(struct fimc_dev *fimc, int index)

static int fimc_isp_subdev_init(struct fimc_dev *fimc, int index)
{
struct s3c_fimc_isp_info *isp_info;
struct s5p_fimc_isp_info *isp_info;
int ret;

ret = fimc_subdev_attach(fimc, index);
Expand Down Expand Up @@ -221,7 +221,7 @@ static int start_streaming(struct vb2_queue *q)
{
struct fimc_ctx *ctx = q->drv_priv;
struct fimc_dev *fimc = ctx->fimc_dev;
struct s3c_fimc_isp_info *isp_info;
struct s5p_fimc_isp_info *isp_info;
int ret;

ret = v4l2_subdev_call(fimc->vid_cap.sd, video, s_stream, 1);
Expand Down Expand Up @@ -570,8 +570,8 @@ static int fimc_cap_enum_input(struct file *file, void *priv,
struct v4l2_input *i)
{
struct fimc_ctx *ctx = priv;
struct s3c_platform_fimc *pldata = ctx->fimc_dev->pdata;
struct s3c_fimc_isp_info *isp_info;
struct s5p_platform_fimc *pldata = ctx->fimc_dev->pdata;
struct s5p_fimc_isp_info *isp_info;

if (i->index >= FIMC_MAX_CAMIF_CLIENTS)
return -EINVAL;
Expand All @@ -590,7 +590,7 @@ static int fimc_cap_s_input(struct file *file, void *priv,
{
struct fimc_ctx *ctx = priv;
struct fimc_dev *fimc = ctx->fimc_dev;
struct s3c_platform_fimc *pdata = fimc->pdata;
struct s5p_platform_fimc *pdata = fimc->pdata;

if (fimc_capture_active(ctx->fimc_dev))
return -EBUSY;
Expand Down
10 changes: 5 additions & 5 deletions drivers/media/video/s5p-fimc/fimc-core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <media/v4l2-device.h>
#include <media/v4l2-mem2mem.h>
#include <media/v4l2-mediabus.h>
#include <media/s3c_fimc.h>
#include <media/s5p_fimc.h>

#include "regs-fimc.h"

Expand Down Expand Up @@ -421,7 +421,7 @@ struct fimc_dev {
spinlock_t slock;
struct mutex lock;
struct platform_device *pdev;
struct s3c_platform_fimc *pdata;
struct s5p_platform_fimc *pdata;
struct samsung_fimc_variant *variant;
int id;
struct clk *clock[NUM_FIMC_CLOCKS];
Expand Down Expand Up @@ -583,12 +583,12 @@ void fimc_hw_set_input_addr(struct fimc_dev *fimc, struct fimc_addr *paddr);
void fimc_hw_set_output_addr(struct fimc_dev *fimc, struct fimc_addr *paddr,
int index);
int fimc_hw_set_camera_source(struct fimc_dev *fimc,
struct s3c_fimc_isp_info *cam);
struct s5p_fimc_isp_info *cam);
int fimc_hw_set_camera_offset(struct fimc_dev *fimc, struct fimc_frame *f);
int fimc_hw_set_camera_polarity(struct fimc_dev *fimc,
struct s3c_fimc_isp_info *cam);
struct s5p_fimc_isp_info *cam);
int fimc_hw_set_camera_type(struct fimc_dev *fimc,
struct s3c_fimc_isp_info *cam);
struct s5p_fimc_isp_info *cam);

/* -----------------------------------------------------*/
/* fimc-core.c */
Expand Down
8 changes: 4 additions & 4 deletions drivers/media/video/s5p-fimc/fimc-reg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <linux/io.h>
#include <linux/delay.h>
#include <mach/map.h>
#include <media/s3c_fimc.h>
#include <media/s5p_fimc.h>

#include "fimc-core.h"

Expand Down Expand Up @@ -532,7 +532,7 @@ void fimc_hw_set_output_addr(struct fimc_dev *dev,
}

int fimc_hw_set_camera_polarity(struct fimc_dev *fimc,
struct s3c_fimc_isp_info *cam)
struct s5p_fimc_isp_info *cam)
{
u32 cfg = readl(fimc->regs + S5P_CIGCTRL);

Expand All @@ -557,7 +557,7 @@ int fimc_hw_set_camera_polarity(struct fimc_dev *fimc,
}

int fimc_hw_set_camera_source(struct fimc_dev *fimc,
struct s3c_fimc_isp_info *cam)
struct s5p_fimc_isp_info *cam)
{
struct fimc_frame *f = &fimc->vid_cap.ctx->s_frame;
u32 cfg = 0;
Expand Down Expand Up @@ -624,7 +624,7 @@ int fimc_hw_set_camera_offset(struct fimc_dev *fimc, struct fimc_frame *f)
}

int fimc_hw_set_camera_type(struct fimc_dev *fimc,
struct s3c_fimc_isp_info *cam)
struct s5p_fimc_isp_info *cam)
{
u32 cfg, tmp;
struct fimc_vid_cap *vid_cap = &fimc->vid_cap;
Expand Down
16 changes: 8 additions & 8 deletions include/media/s3c_fimc.h → include/media/s5p_fimc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
* published by the Free Software Foundation.
*/

#ifndef S3C_FIMC_H_
#define S3C_FIMC_H_
#ifndef S5P_FIMC_H_
#define S5P_FIMC_H_

enum cam_bus_type {
FIMC_ITU_601 = 1,
Expand All @@ -27,7 +27,7 @@ enum cam_bus_type {
struct i2c_board_info;

/**
* struct s3c_fimc_isp_info - image sensor information required for host
* struct s5p_fimc_isp_info - image sensor information required for host
* interace configuration.
*
* @board_info: pointer to I2C subdevice's board info
Expand All @@ -37,7 +37,7 @@ struct i2c_board_info;
* @bus_width: camera data bus width in bits
* @flags: flags defining bus signals polarity inversion (High by default)
*/
struct s3c_fimc_isp_info {
struct s5p_fimc_isp_info {
struct i2c_board_info *board_info;
enum cam_bus_type bus_type;
u16 i2c_bus_num;
Expand All @@ -50,11 +50,11 @@ struct s3c_fimc_isp_info {
#define FIMC_MAX_CAMIF_CLIENTS 2

/**
* struct s3c_platform_fimc - camera host interface platform data
* struct s5p_platform_fimc - camera host interface platform data
*
* @isp_info: properties of camera sensor required for host interface setup
*/
struct s3c_platform_fimc {
struct s3c_fimc_isp_info *isp_info[FIMC_MAX_CAMIF_CLIENTS];
struct s5p_platform_fimc {
struct s5p_fimc_isp_info *isp_info[FIMC_MAX_CAMIF_CLIENTS];
};
#endif /* S3C_FIMC_H_ */
#endif /* S5P_FIMC_H_ */

0 comments on commit df7e09a

Please sign in to comment.