diff options
-rw-r--r-- | drivers/media/video/ov9740.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/media/video/ov9740.c b/drivers/media/video/ov9740.c index 67b7020c933e..5920f600990f 100644 --- a/drivers/media/video/ov9740.c +++ b/drivers/media/video/ov9740.c | |||
@@ -562,25 +562,6 @@ static int ov9740_s_stream(struct v4l2_subdev *sd, int enable) | |||
562 | return ret; | 562 | return ret; |
563 | } | 563 | } |
564 | 564 | ||
565 | /* Alter bus settings on camera side */ | ||
566 | static int ov9740_set_bus_param(struct soc_camera_device *icd, | ||
567 | unsigned long flags) | ||
568 | { | ||
569 | return 0; | ||
570 | } | ||
571 | |||
572 | /* Request bus settings on camera side */ | ||
573 | static unsigned long ov9740_query_bus_param(struct soc_camera_device *icd) | ||
574 | { | ||
575 | struct soc_camera_link *icl = to_soc_camera_link(icd); | ||
576 | |||
577 | unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER | | ||
578 | SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH | | ||
579 | SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8; | ||
580 | |||
581 | return soc_camera_apply_sensor_flags(icl, flags); | ||
582 | } | ||
583 | |||
584 | /* select nearest higher resolution for capture */ | 565 | /* select nearest higher resolution for capture */ |
585 | static void ov9740_res_roundup(u32 *width, u32 *height) | 566 | static void ov9740_res_roundup(u32 *width, u32 *height) |
586 | { | 567 | { |
@@ -945,12 +926,11 @@ err: | |||
945 | } | 926 | } |
946 | 927 | ||
947 | static struct soc_camera_ops ov9740_ops = { | 928 | static struct soc_camera_ops ov9740_ops = { |
948 | .set_bus_param = ov9740_set_bus_param, | ||
949 | .query_bus_param = ov9740_query_bus_param, | ||
950 | .controls = ov9740_controls, | 929 | .controls = ov9740_controls, |
951 | .num_controls = ARRAY_SIZE(ov9740_controls), | 930 | .num_controls = ARRAY_SIZE(ov9740_controls), |
952 | }; | 931 | }; |
953 | 932 | ||
933 | /* Request bus settings on camera side */ | ||
954 | static int ov9740_g_mbus_config(struct v4l2_subdev *sd, | 934 | static int ov9740_g_mbus_config(struct v4l2_subdev *sd, |
955 | struct v4l2_mbus_config *cfg) | 935 | struct v4l2_mbus_config *cfg) |
956 | { | 936 | { |