summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88
diff options
context:
space:
mode:
authorFrederic CAND <frederic.cand@anevia.com>2008-10-30 08:53:07 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 20:53:25 +0100
commitb84ca9f2a08601205878a07a91ef418a1a5f77b1 (patch)
treea6af6ece0b4d02ca2c33b0e40036d3b213c4c699 /drivers/media/video/cx88
parentV4L/DVB (9491): rationalise addresses to one common one (diff)
downloadlinux-b84ca9f2a08601205878a07a91ef418a1a5f77b1.tar.xz
linux-b84ca9f2a08601205878a07a91ef418a1a5f77b1.zip
V4L/DVB (9497): tda9887/cx88: Adds SECAM/BGH standards
Adds secam bgh support Signed-off-by: Frederic CAND <frederic.cand@anevia.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r--drivers/media/video/cx88/cx88-core.c3
-rw-r--r--drivers/media/video/cx88/cx88.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 60705b08bfe8..b045874ad04f 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -844,6 +844,9 @@ static int set_tvaudio(struct cx88_core *core)
} else if (V4L2_STD_SECAM_L & norm) {
core->tvaudio = WW_L;
+ } else if ((V4L2_STD_SECAM_B | V4L2_STD_SECAM_G | V4L2_STD_SECAM_H) & norm) {
+ core->tvaudio = WW_BG;
+
} else if (V4L2_STD_SECAM_DK & norm) {
core->tvaudio = WW_DK;
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index f4240965be32..f3c26ab6c7c6 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -58,7 +58,8 @@
V4L2_STD_NTSC_M| V4L2_STD_NTSC_M_JP| V4L2_STD_NTSC_443 | \
V4L2_STD_PAL_BG| V4L2_STD_PAL_DK | V4L2_STD_PAL_I | \
V4L2_STD_PAL_M | V4L2_STD_PAL_N | V4L2_STD_PAL_Nc | \
- V4L2_STD_PAL_60| V4L2_STD_SECAM_L | V4L2_STD_SECAM_DK )
+ V4L2_STD_PAL_60| V4L2_STD_SECAM_L | V4L2_STD_SECAM_DK | \
+ V4L2_STD_SECAM_B| V4L2_STD_SECAM_G | V4L2_STD_SECAM_H )
#define FORMAT_FLAGS_PACKED 0x01
#define FORMAT_FLAGS_PLANAR 0x02