|
@@ -286,29 +286,6 @@ static int ov9640_s_stream(struct v4l2_subdev *sd, int enable)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-/* Alter bus settings on camera side */
|
|
|
-static int ov9640_set_bus_param(struct soc_camera_device *icd,
|
|
|
- unsigned long flags)
|
|
|
-{
|
|
|
- return 0;
|
|
|
-}
|
|
|
-
|
|
|
-/* Request bus settings on camera side */
|
|
|
-static unsigned long ov9640_query_bus_param(struct soc_camera_device *icd)
|
|
|
-{
|
|
|
- struct soc_camera_link *icl = to_soc_camera_link(icd);
|
|
|
-
|
|
|
- /*
|
|
|
- * REVISIT: the camera probably can do 10 bit transfers, but I don't
|
|
|
- * have those pins connected on my hardware.
|
|
|
- */
|
|
|
- unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
|
|
|
- SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
|
|
|
- SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;
|
|
|
-
|
|
|
- return soc_camera_apply_sensor_flags(icl, flags);
|
|
|
-}
|
|
|
-
|
|
|
/* Get status of additional camera capabilities */
|
|
|
static int ov9640_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
|
|
|
{
|
|
@@ -648,8 +625,6 @@ static int ov9640_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
static int ov9640_video_probe(struct soc_camera_device *icd,
|
|
|
struct i2c_client *client)
|
|
|
{
|
|
@@ -707,8 +682,6 @@ err:
|
|
|
}
|
|
|
|
|
|
static struct soc_camera_ops ov9640_ops = {
|
|
|
- .set_bus_param = ov9640_set_bus_param,
|
|
|
- .query_bus_param = ov9640_query_bus_param,
|
|
|
.controls = ov9640_controls,
|
|
|
.num_controls = ARRAY_SIZE(ov9640_controls),
|
|
|
};
|
|
@@ -724,6 +697,7 @@ static struct v4l2_subdev_core_ops ov9640_core_ops = {
|
|
|
|
|
|
};
|
|
|
|
|
|
+/* Request bus settings on camera side */
|
|
|
static int ov9640_g_mbus_config(struct v4l2_subdev *sd,
|
|
|
struct v4l2_mbus_config *cfg)
|
|
|
{
|