From a79fae94d8f61dbc5b4d81f5565ad00d7974d3c0 Mon Sep 17 00:00:00 2001
From: Darron Broad <darron@kewl.org>
Date: Sat, 11 Oct 2008 11:49:30 -0300
Subject: [PATCH] --- yaml --- r: 115625 b: refs/heads/master c:
 923ac7f7d76116f4dd8d543f398e4811d2b1a30e h: refs/heads/master i:   115623:
 5b0a356b85cf721cf0c2dac66cfb85f1e6c56d44 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/cx88/cx88-cards.c | 8 ++++++++
 trunk/drivers/media/video/cx88/cx88.h       | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index af2666254e7e..1eeca25760c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59b1842da1c6f33ad2e8da82d3dfb3445751d964
+refs/heads/master: 923ac7f7d76116f4dd8d543f398e4811d2b1a30e
diff --git a/trunk/drivers/media/video/cx88/cx88-cards.c b/trunk/drivers/media/video/cx88/cx88-cards.c
index 3ef49c7a2514..6986844e33c8 100644
--- a/trunk/drivers/media/video/cx88/cx88-cards.c
+++ b/trunk/drivers/media/video/cx88/cx88-cards.c
@@ -1277,18 +1277,22 @@ static const struct cx88_board cx88_boards[] = {
 		.tuner_addr     = ADDR_UNSET,
 		.radio_addr     = ADDR_UNSET,
 		.tda9887_conf   = TDA9887_PRESENT,
+		.audio_chip     = V4L2_IDENT_WM8775,
 		.input          = {{
 			.type   = CX88_VMUX_TELEVISION,
 			.vmux   = 0,
 			.gpio0  = 0x84bf,
+			.audioroute = 1,
 		},{
 			.type   = CX88_VMUX_COMPOSITE1,
 			.vmux   = 1,
 			.gpio0  = 0x84bf,
+			.audioroute = 2,
 		},{
 			.type   = CX88_VMUX_SVIDEO,
 			.vmux   = 2,
 			.gpio0  = 0x84bf,
+			.audioroute = 2,
 		}},
 		.mpeg           = CX88_MPEG_DVB,
 		.num_frontends	= 2,
@@ -1717,6 +1721,7 @@ static const struct cx88_board cx88_boards[] = {
 		.tuner_addr     = ADDR_UNSET,
 		.radio_addr     = ADDR_UNSET,
 		.tda9887_conf   = TDA9887_PRESENT,
+		.audio_chip     = V4L2_IDENT_WM8775,
 		/*
 		 * GPIO0 (WINTV2000)
 		 *
@@ -1751,14 +1756,17 @@ static const struct cx88_board cx88_boards[] = {
 			.type   = CX88_VMUX_TELEVISION,
 			.vmux   = 0,
 			.gpio0  = 0xc4bf,
+			.audioroute = 1,
 		}, {
 			.type   = CX88_VMUX_COMPOSITE1,
 			.vmux   = 1,
 			.gpio0  = 0xc4bf,
+			.audioroute = 2,
 		}, {
 			.type   = CX88_VMUX_SVIDEO,
 			.vmux   = 2,
 			.gpio0  = 0xc4bf,
+			.audioroute = 2,
 		} },
 		/* fixme: Add radio support */
 		.mpeg           = CX88_MPEG_DVB,
diff --git a/trunk/drivers/media/video/cx88/cx88.h b/trunk/drivers/media/video/cx88/cx88.h
index 063f7b57e42a..100ffc4b5d90 100644
--- a/trunk/drivers/media/video/cx88/cx88.h
+++ b/trunk/drivers/media/video/cx88/cx88.h
@@ -247,7 +247,7 @@ struct cx88_input {
 	enum cx88_itype type;
 	u32             gpio0, gpio1, gpio2, gpio3;
 	unsigned int    vmux:2;
-	unsigned int    audioroute:2;
+	unsigned int    audioroute:4;
 };
 
 struct cx88_board {