aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/mt9m001.c2
-rw-r--r--drivers/media/video/mt9m111.c2
-rw-r--r--drivers/media/video/mt9v022.c2
-rw-r--r--drivers/media/video/ov772x.c2
-rw-r--r--drivers/media/video/pxa_camera.c1
5 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index c1bf75ef274..2d1034dad49 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -276,7 +276,7 @@ static unsigned long mt9m001_query_bus_param(struct soc_camera_device *icd)
276 /* MT9M001 has all capture_format parameters fixed */ 276 /* MT9M001 has all capture_format parameters fixed */
277 unsigned long flags = SOCAM_DATAWIDTH_10 | SOCAM_PCLK_SAMPLE_RISING | 277 unsigned long flags = SOCAM_DATAWIDTH_10 | SOCAM_PCLK_SAMPLE_RISING |
278 SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH | 278 SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
279 SOCAM_MASTER; 279 SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER;
280 280
281 if (bus_switch_possible(mt9m001)) 281 if (bus_switch_possible(mt9m001))
282 flags |= SOCAM_DATAWIDTH_8; 282 flags |= SOCAM_DATAWIDTH_8;
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c
index 5b8e20979cc..6c363af165b 100644
--- a/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@ -420,7 +420,7 @@ static unsigned long mt9m111_query_bus_param(struct soc_camera_device *icd)
420 struct soc_camera_link *icl = mt9m111->client->dev.platform_data; 420 struct soc_camera_link *icl = mt9m111->client->dev.platform_data;
421 unsigned long flags = SOCAM_MASTER | SOCAM_PCLK_SAMPLE_RISING | 421 unsigned long flags = SOCAM_MASTER | SOCAM_PCLK_SAMPLE_RISING |
422 SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH | 422 SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
423 SOCAM_DATAWIDTH_8; 423 SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;
424 424
425 return soc_camera_apply_sensor_flags(icl, flags); 425 return soc_camera_apply_sensor_flags(icl, flags);
426} 426}
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c
index b04c8cb1644..6eb4b3a818d 100644
--- a/drivers/media/video/mt9v022.c
+++ b/drivers/media/video/mt9v022.c
@@ -336,7 +336,7 @@ static unsigned long mt9v022_query_bus_param(struct soc_camera_device *icd)
336 return SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING | 336 return SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING |
337 SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW | 337 SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW |
338 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW | 338 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW |
339 SOCAM_MASTER | SOCAM_SLAVE | 339 SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_SLAVE |
340 width_flag; 340 width_flag;
341} 341}
342 342
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index 3c9e0ba974e..4d8ac6fd89f 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -718,7 +718,7 @@ static unsigned long ov772x_query_bus_param(struct soc_camera_device *icd)
718 struct soc_camera_link *icl = priv->client->dev.platform_data; 718 struct soc_camera_link *icl = priv->client->dev.platform_data;
719 unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER | 719 unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
720 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH | 720 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
721 priv->info->buswidth; 721 SOCAM_DATA_ACTIVE_HIGH | priv->info->buswidth;
722 722
723 return soc_camera_apply_sensor_flags(icl, flags); 723 return soc_camera_apply_sensor_flags(icl, flags);
724} 724}
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 0c4ce58c53d..2cc203cfbe6 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -878,6 +878,7 @@ static int test_platform_param(struct pxa_camera_dev *pcdev,
878 SOCAM_HSYNC_ACTIVE_LOW | 878 SOCAM_HSYNC_ACTIVE_LOW |
879 SOCAM_VSYNC_ACTIVE_HIGH | 879 SOCAM_VSYNC_ACTIVE_HIGH |
880 SOCAM_VSYNC_ACTIVE_LOW | 880 SOCAM_VSYNC_ACTIVE_LOW |
881 SOCAM_DATA_ACTIVE_HIGH |
881 SOCAM_PCLK_SAMPLE_RISING | 882 SOCAM_PCLK_SAMPLE_RISING |
882 SOCAM_PCLK_SAMPLE_FALLING; 883 SOCAM_PCLK_SAMPLE_FALLING;
883 884