Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 800d3c6f90b61cc82b09db635b59c00b1c460728

Authored by Mauro Carvalho Chehab
Committed by Linus Torvalds
1 parent c817e76342
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] v4l: (943) added secam l video standard 

- Added SECAM L' video standard
- SECAM L' is a Secam variant that requires special config.

This patch adds support on V4L core. Requires aditional patches
on tuners to support.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 9 additions and 3 deletions Side-by-side Diff

drivers/media/video/tuner-core.c
Diff comments   View file @ 800d3c6
... ... @@ -251,7 +251,7 @@
251 251  
252 252 static char pal[] = "-";
253 253 module_param_string(pal, pal, sizeof(pal), 0644);
254   -static char secam[] = "-";
  254 +static char secam[] = "--";
255 255 module_param_string(secam, secam, sizeof(secam), 0644);
256 256  
257 257 /* get more precise norm info from insmod option */
... ... @@ -307,8 +307,13 @@
307 307 break;
308 308 case 'l':
309 309 case 'L':
310   - tuner_dbg ("insmod fixup: SECAM => SECAM-L\n");
311   - t->std = V4L2_STD_SECAM_L;
  310 + if ((secam[1]=='C')||(secam[1]=='c')) {
  311 + tuner_dbg ("insmod fixup: SECAM => SECAM-L'\n");
  312 + t->std = V4L2_STD_SECAM_LC;
  313 + } else {
  314 + tuner_dbg ("insmod fixup: SECAM => SECAM-L\n");
  315 + t->std = V4L2_STD_SECAM_L;
  316 + }
312 317 break;
313 318 case '-':
314 319 /* default parameter, do nothing */
include/linux/videodev2.h
Diff comments   View file @ 800d3c6
... ... @@ -636,6 +636,7 @@
636 636 #define V4L2_STD_SECAM_K ((v4l2_std_id)0x00100000)
637 637 #define V4L2_STD_SECAM_K1 ((v4l2_std_id)0x00200000)
638 638 #define V4L2_STD_SECAM_L ((v4l2_std_id)0x00400000)
  639 +#define V4L2_STD_SECAM_LC ((v4l2_std_id)0x00800000)
639 640  
640 641 /* ATSC/HDTV */
641 642 #define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000)