Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df7e09a3 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8293ebfc

drivers/media/video/s5p-fimc/fimc-capture.c

+8 −8
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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);
@@ -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);
@@ -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;
@@ -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;

drivers/media/video/s5p-fimc/fimc-core.h

+5 −5
Original line number Diff line number Diff line
@@ -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"
@@ -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];
@@ -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 */

drivers/media/video/s5p-fimc/fimc-reg.c

+4 −4
Original line number Diff line number Diff line
@@ -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"
@@ -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);
@@ -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;
@@ -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;

include/media/s3c_fimc.h→include/media/s5p_fimc.h

+8 −8
Original line number Diff line number Diff line
@@ -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,
@@ -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
@@ -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;
@@ -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_ */