Commit 72ebfff2 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Rename camera to sensor 



The camera v4l2_subdev pointer in struct atomisp_input_subdev points to
an image sensor, rename camera to sensor to make this more clear.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent eb5e3cdc

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+14 −14
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static unsigned short atomisp_get_sensor_fps(struct atomisp_sub_device *asd) 
	unsigned short fps = 0;

	int ret;



	ret = v4l2_subdev_call_state_active(isp->inputs[asd->input_curr].camera,

	ret = v4l2_subdev_call_state_active(isp->inputs[asd->input_curr].sensor,

					    pad, get_frame_interval, &fi);



	if (!ret && fi.interval.numerator)
@@ -881,7 +881,7 @@ void atomisp_assert_recovery_work(struct work_struct *work) 
	spin_unlock_irqrestore(&isp->lock, flags);



	/* stream off sensor */

	ret = v4l2_subdev_call(isp->inputs[isp->asd.input_curr].camera, video, s_stream, 0);

	ret = v4l2_subdev_call(isp->inputs[isp->asd.input_curr].sensor, video, s_stream, 0);

	if (ret)

		dev_warn(isp->dev, "Stopping sensor stream failed: %d\n", ret);
@@ -936,7 +936,7 @@ void atomisp_assert_recovery_work(struct work_struct *work) 
	/* Requeue unprocessed per-frame parameters. */

	atomisp_recover_params_queue(&isp->asd.video_out);



	ret = v4l2_subdev_call(isp->inputs[isp->asd.input_curr].camera, video, s_stream, 1);

	ret = v4l2_subdev_call(isp->inputs[isp->asd.input_curr].sensor, video, s_stream, 1);

	if (ret)

		dev_err(isp->dev, "Starting sensor stream failed: %d\n", ret);
@@ -3124,7 +3124,7 @@ int atomisp_color_effect(struct atomisp_sub_device *asd, int flag, 
	control.id = V4L2_CID_COLORFX;

	control.value = *effect;

	ret =

	    v4l2_s_ctrl(NULL, isp->inputs[asd->input_curr].camera->ctrl_handler,

	    v4l2_s_ctrl(NULL, isp->inputs[asd->input_curr].sensor->ctrl_handler,

			&control);

	/*

	 * if set color effect to sensor successfully, return
@@ -3620,16 +3620,16 @@ int atomisp_s_sensor_power(struct atomisp_device *isp, unsigned int input, bool 
{

	int ret;



	if (isp->inputs[input].camera_on == on)

	if (isp->inputs[input].sensor_on == on)

		return 0;



	ret = v4l2_subdev_call(isp->inputs[input].camera, core, s_power, on);

	ret = v4l2_subdev_call(isp->inputs[input].sensor, core, s_power, on);

	if (ret && ret != -ENOIOCTLCMD) {

		dev_err(isp->dev, "Error setting sensor power %d: %d\n", on, ret);

		return ret;

	}



	isp->inputs[input].camera_on = on;

	isp->inputs[input].sensor_on = on;

	return 0;

}
@@ -3677,7 +3677,7 @@ void atomisp_setup_input_links(struct atomisp_device *isp) 
		 * will end up calling atomisp_link_setup() which calls this

		 * function again leading to endless recursion.

		 */

		if (isp->sensor_subdevs[i] == isp->inputs[isp->asd.input_curr].camera)

		if (isp->sensor_subdevs[i] == isp->inputs[isp->asd.input_curr].sensor)

			link->flags |= MEDIA_LNK_FL_ENABLED;

		else

			link->flags &= ~MEDIA_LNK_FL_ENABLED;
@@ -3704,7 +3704,7 @@ static int atomisp_set_sensor_crop_and_fmt(struct atomisp_device *isp, 
	struct v4l2_subdev_state *sd_state;

	int ret = 0;



	if (!input->camera)

	if (!input->sensor)

		return -EINVAL;



	/*
@@ -3719,7 +3719,7 @@ static int atomisp_set_sensor_crop_and_fmt(struct atomisp_device *isp, 
	}



	sd_state = (which == V4L2_SUBDEV_FORMAT_TRY) ? input->try_sd_state :

						       input->camera->active_state;

						       input->sensor->active_state;

	if (sd_state)

		v4l2_subdev_lock_state(sd_state);
@@ -3740,14 +3740,14 @@ static int atomisp_set_sensor_crop_and_fmt(struct atomisp_device *isp, 
	sel.r.left = ((input->native_rect.width - sel.r.width) / 2) & ~1;

	sel.r.top = ((input->native_rect.height - sel.r.height) / 2) & ~1;



	ret = v4l2_subdev_call(input->camera, pad, set_selection, sd_state, &sel);

	ret = v4l2_subdev_call(input->sensor, pad, set_selection, sd_state, &sel);

	if (ret)

		dev_err(isp->dev, "Error setting crop to (%d,%d)/%ux%u: %d\n",

			sel.r.left, sel.r.top, sel.r.width, sel.r.height, ret);



set_fmt:

	if (ret == 0)

		ret = v4l2_subdev_call(input->camera, pad, set_fmt, sd_state, &format);

		ret = v4l2_subdev_call(input->sensor, pad, set_fmt, sd_state, &format);



	if (sd_state)

		v4l2_subdev_unlock_state(sd_state);
@@ -3880,7 +3880,7 @@ static inline int atomisp_set_sensor_mipi_to_isp( 
	u32 mipi_port, metadata_width = 0, metadata_height = 0;



	ctrl.id = V4L2_CID_LINK_FREQ;

	if (v4l2_g_ctrl(input->camera->ctrl_handler, &ctrl) == 0)

	if (v4l2_g_ctrl(input->sensor->ctrl_handler, &ctrl) == 0)

		mipi_freq = ctrl.value;



	if (asd->stream_env[stream_id].isys_configs == 1) {
@@ -4043,7 +4043,7 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev, 
	if (!format)

		return -EINVAL;



	mipi_info = atomisp_to_sensor_mipi_info(input->camera);

	mipi_info = atomisp_to_sensor_mipi_info(input->sensor);



	if (atomisp_set_sensor_mipi_to_isp(asd, ATOMISP_INPUT_STREAM_GENERAL,

					   mipi_info))

drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

+1 −1
Original line number Diff line number Diff line
@@ -1845,7 +1845,7 @@ static enum ia_css_pipe_mode __pipe_id_to_pipe_mode( 
{

	struct atomisp_device *isp = asd->isp;

	struct camera_mipi_info *mipi_info = atomisp_to_sensor_mipi_info(

		isp->inputs[asd->input_curr].camera);

		isp->inputs[asd->input_curr].sensor);



	switch (pipe_id) {

	case IA_CSS_PIPE_ID_COPY:

drivers/staging/media/atomisp/pci/atomisp_csi2.c

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static void atomisp_csi2_configure_isp2401(struct atomisp_sub_device *asd) 


	ctrl.id = V4L2_CID_LINK_FREQ;

	if (v4l2_g_ctrl

	    (isp->inputs[asd->input_curr].camera->ctrl_handler, &ctrl) == 0)

	    (isp->inputs[asd->input_curr].sensor->ctrl_handler, &ctrl) == 0)

		mipi_freq = ctrl.value;



	clk_termen = atomisp_csi2_configure_calc(coeff_clk_termen, mipi_freq,

drivers/staging/media/atomisp/pci/atomisp_internal.h

+2 −2
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ struct atomisp_input_subdev { 
	u32 code; /* MEDIA_BUS_FMT_* */

	bool binning_support;

	bool crop_support;

	bool camera_on;

	struct v4l2_subdev *camera;

	bool sensor_on;

	struct v4l2_subdev *sensor;

	struct v4l2_subdev *csi_port;

	/* Sensor rects for sensors which support crop */

	struct v4l2_rect native_rect;

drivers/staging/media/atomisp/pci/atomisp_ioctl.c

+15 −15
Original line number Diff line number Diff line
@@ -386,11 +386,11 @@ static int atomisp_enum_input(struct file *file, void *fh, 
	if (index >= isp->input_cnt)

		return -EINVAL;



	if (!isp->inputs[index].camera)

	if (!isp->inputs[index].sensor)

		return -EINVAL;



	memset(input, 0, sizeof(struct v4l2_input));

	strscpy(input->name, isp->inputs[index].camera->name,

	strscpy(input->name, isp->inputs[index].sensor->name,

		sizeof(input->name));



	input->type = V4L2_INPUT_TYPE_CAMERA;
@@ -433,7 +433,7 @@ static int atomisp_s_input(struct file *file, void *fh, unsigned int input) 
	if (input >= isp->input_cnt)

		return -EINVAL;



	if (!isp->inputs[input].camera)

	if (!isp->inputs[input].sensor)

		return -EINVAL;



	ret = atomisp_pipe_check(pipe, true);
@@ -539,14 +539,14 @@ static int atomisp_enum_framesizes(struct file *file, void *priv, 
	struct v4l2_subdev_state *act_sd_state;

	int ret;



	if (!input->camera)

	if (!input->sensor)

		return -EINVAL;



	if (input->crop_support)

		return atomisp_enum_framesizes_crop(isp, fsize);



	act_sd_state = v4l2_subdev_lock_and_get_active_state(input->camera);

	ret = v4l2_subdev_call(input->camera, pad, enum_frame_size,

	act_sd_state = v4l2_subdev_lock_and_get_active_state(input->sensor);

	ret = v4l2_subdev_call(input->sensor, pad, enum_frame_size,

			       act_sd_state, &fse);

	if (act_sd_state)

		v4l2_subdev_unlock_state(act_sd_state);
@@ -577,11 +577,11 @@ static int atomisp_enum_frameintervals(struct file *file, void *priv, 
	struct v4l2_subdev_state *act_sd_state;

	int ret;



	if (!input->camera)

	if (!input->sensor)

		return -EINVAL;



	act_sd_state = v4l2_subdev_lock_and_get_active_state(input->camera);

	ret = v4l2_subdev_call(input->camera, pad, enum_frame_interval,

	act_sd_state = v4l2_subdev_lock_and_get_active_state(input->sensor);

	ret = v4l2_subdev_call(input->sensor, pad, enum_frame_interval,

			       act_sd_state, &fie);

	if (act_sd_state)

		v4l2_subdev_unlock_state(act_sd_state);
@@ -609,11 +609,11 @@ static int atomisp_enum_fmt_cap(struct file *file, void *fh, 
	unsigned int i, fi = 0;

	int ret;



	if (!input->camera)

	if (!input->sensor)

		return -EINVAL;



	act_sd_state = v4l2_subdev_lock_and_get_active_state(input->camera);

	ret = v4l2_subdev_call(input->camera, pad, enum_mbus_code,

	act_sd_state = v4l2_subdev_lock_and_get_active_state(input->sensor);

	ret = v4l2_subdev_call(input->sensor, pad, enum_mbus_code,

			       act_sd_state, &code);

	if (act_sd_state)

		v4l2_subdev_unlock_state(act_sd_state);
@@ -945,7 +945,7 @@ int atomisp_start_streaming(struct vb2_queue *vq, unsigned int count) 
	}



	/* stream on the sensor */

	ret = v4l2_subdev_call(isp->inputs[asd->input_curr].camera,

	ret = v4l2_subdev_call(isp->inputs[asd->input_curr].sensor,

			       video, s_stream, 1);

	if (ret) {

		dev_err(isp->dev, "Starting sensor stream failed: %d\n", ret);
@@ -1002,7 +1002,7 @@ void atomisp_stop_streaming(struct vb2_queue *vq) 


	atomisp_subdev_cleanup_pending_events(asd);



	ret = v4l2_subdev_call(isp->inputs[asd->input_curr].camera,

	ret = v4l2_subdev_call(isp->inputs[asd->input_curr].sensor,

			       video, s_stream, 0);

	if (ret)

		dev_warn(isp->dev, "Stopping sensor stream failed: %d\n", ret);
@@ -1332,7 +1332,7 @@ static int atomisp_s_parm(struct file *file, void *fh, 


		fi.interval = parm->parm.capture.timeperframe;



		rval = v4l2_subdev_call_state_active(isp->inputs[asd->input_curr].camera,

		rval = v4l2_subdev_call_state_active(isp->inputs[asd->input_curr].sensor,

						     pad, set_frame_interval, &fi);

		if (!rval)

			parm->parm.capture.timeperframe = fi.interval;