diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-02-23 10:12:58 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:42:52 -0400 |
commit | 2d9329f3a551b50350a15d19edd9ab3df6c6bad0 (patch) | |
tree | 0e387e6878685f62d642a4f1130bb8c172ab161b | |
parent | 8420fa7ee22c1d681549ff7ab0466ceda5a911c2 (diff) |
V4L/DVB (10665): soc-camera: add data signal polarity flags to drivers
All soc-camera camera and host drivers must specify supported data signal
polarity, after all drivers are fixed, we'll add a suitable test to
soc_camera_bus_param_compatible().
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | arch/sh/boards/board-ap325rxa.c | 3 | ||||
-rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 5 | ||||
-rw-r--r-- | drivers/media/video/mt9m001.c | 2 | ||||
-rw-r--r-- | drivers/media/video/mt9m111.c | 2 | ||||
-rw-r--r-- | drivers/media/video/mt9v022.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ov772x.c | 2 | ||||
-rw-r--r-- | drivers/media/video/pxa_camera.c | 1 |
7 files changed, 10 insertions, 7 deletions
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c index a64e38841c49..e27655b8a98d 100644 --- a/arch/sh/boards/board-ap325rxa.c +++ b/arch/sh/boards/board-ap325rxa.c | |||
@@ -310,7 +310,8 @@ static struct platform_device camera_device = { | |||
310 | 310 | ||
311 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { | 311 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { |
312 | .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | | 312 | .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | |
313 | SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8, | 313 | SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER | |
314 | SOCAM_DATAWIDTH_8, | ||
314 | }; | 315 | }; |
315 | 316 | ||
316 | static struct resource ceu_resources[] = { | 317 | static struct resource ceu_resources[] = { |
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index bc35b4cae6b3..4fd6a727873c 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c | |||
@@ -352,8 +352,9 @@ static int tw9910_power(struct device *dev, int mode) | |||
352 | } | 352 | } |
353 | 353 | ||
354 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { | 354 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { |
355 | .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \ | 355 | .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING |
356 | | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH, | 356 | | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
357 | | SOCAM_DATA_ACTIVE_HIGH, | ||
357 | }; | 358 | }; |
358 | 359 | ||
359 | static struct resource migor_ceu_resources[] = { | 360 | static struct resource migor_ceu_resources[] = { |
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c index c1bf75ef2741..2d1034dad495 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 5b8e20979cce..6c363af165b7 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 b04c8cb1644d..6eb4b3a818d7 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 3c9e0ba974e9..4d8ac6fd89fb 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 0c4ce58c53d5..2cc203cfbe6c 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 | ||