Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2d9329f3a551b50350a15d19edd9ab3df6c6bad0

Authored by Guennadi Liakhovetski
Committed by Mauro Carvalho Chehab
1 parent 8420fa7ee2
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 7 changed files with 10 additions and 7 deletions Side-by-side Diff

arch/sh/boards/board-ap325rxa.c
Diff comments   View file @ 2d9329f
... ... @@ -310,7 +310,8 @@
310 310  
311 311 static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
312 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 317 static struct resource ceu_resources[] = {
arch/sh/boards/mach-migor/setup.c
Diff comments   View file @ 2d9329f
... ... @@ -352,8 +352,9 @@
352 352 }
353 353  
354 354 static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
355   - .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING \
356   - | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH,
  355 + .flags = SOCAM_MASTER | SOCAM_DATAWIDTH_8 | SOCAM_PCLK_SAMPLE_RISING
  356 + | SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH
  357 + | SOCAM_DATA_ACTIVE_HIGH,
357 358 };
358 359  
359 360 static struct resource migor_ceu_resources[] = {
drivers/media/video/mt9m001.c
Diff comments   View file @ 2d9329f
... ... @@ -276,7 +276,7 @@
276 276 /* MT9M001 has all capture_format parameters fixed */
277 277 unsigned long flags = SOCAM_DATAWIDTH_10 | SOCAM_PCLK_SAMPLE_RISING |
278 278 SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
279   - SOCAM_MASTER;
  279 + SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER;
280 280  
281 281 if (bus_switch_possible(mt9m001))
282 282 flags |= SOCAM_DATAWIDTH_8;
drivers/media/video/mt9m111.c
Diff comments   View file @ 2d9329f
... ... @@ -420,7 +420,7 @@
420 420 struct soc_camera_link *icl = mt9m111->client->dev.platform_data;
421 421 unsigned long flags = SOCAM_MASTER | SOCAM_PCLK_SAMPLE_RISING |
422 422 SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH |
423   - SOCAM_DATAWIDTH_8;
  423 + SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;
424 424  
425 425 return soc_camera_apply_sensor_flags(icl, flags);
426 426 }
drivers/media/video/mt9v022.c
Diff comments   View file @ 2d9329f
... ... @@ -336,7 +336,7 @@
336 336 return SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING |
337 337 SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW |
338 338 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW |
339   - SOCAM_MASTER | SOCAM_SLAVE |
  339 + SOCAM_DATA_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_SLAVE |
340 340 width_flag;
341 341 }
342 342  
drivers/media/video/ov772x.c
Diff comments   View file @ 2d9329f
... ... @@ -718,7 +718,7 @@
718 718 struct soc_camera_link *icl = priv->client->dev.platform_data;
719 719 unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
720 720 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
721   - priv->info->buswidth;
  721 + SOCAM_DATA_ACTIVE_HIGH | priv->info->buswidth;
722 722  
723 723 return soc_camera_apply_sensor_flags(icl, flags);
724 724 }
drivers/media/video/pxa_camera.c
Diff comments   View file @ 2d9329f
... ... @@ -878,6 +878,7 @@
878 878 SOCAM_HSYNC_ACTIVE_LOW |
879 879 SOCAM_VSYNC_ACTIVE_HIGH |
880 880 SOCAM_VSYNC_ACTIVE_LOW |
  881 + SOCAM_DATA_ACTIVE_HIGH |
881 882 SOCAM_PCLK_SAMPLE_RISING |
882 883 SOCAM_PCLK_SAMPLE_FALLING;
883 884