Commit 649e13a9 authored by Darron Broad's avatar Darron Broad Committed by Mauro Carvalho Chehab

V4L/DVB (9267): cx88: Update of audio routing config for FM radio

This adds audio routing for the hvr-1300/3000/4000 cards
enabling FM audio for the I2S ADC method of the cx88.

At this time only the HVR-4000 has been tested. It
is assumed the HVR-3000/1300 are the same.
Signed-off-by: default avatarDarron Broad <darron@kewl.org>
Signed-off-by: default avatarSteven Toth <stoth@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e43f3fab
...@@ -1281,22 +1281,26 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1281,22 +1281,26 @@ static const struct cx88_board cx88_boards[] = {
.type = CX88_VMUX_TELEVISION, .type = CX88_VMUX_TELEVISION,
.vmux = 0, .vmux = 0,
.gpio0 = 0x84bf, .gpio0 = 0x84bf,
/* 1: TV Audio / FM Mono */
.audioroute = 1, .audioroute = 1,
},{ },{
.type = CX88_VMUX_COMPOSITE1, .type = CX88_VMUX_COMPOSITE1,
.vmux = 1, .vmux = 1,
.gpio0 = 0x84bf, .gpio0 = 0x84bf,
/* 2: Line-In */
.audioroute = 2, .audioroute = 2,
},{ },{
.type = CX88_VMUX_SVIDEO, .type = CX88_VMUX_SVIDEO,
.vmux = 2, .vmux = 2,
.gpio0 = 0x84bf, .gpio0 = 0x84bf,
/* 2: Line-In */
.audioroute = 2, .audioroute = 2,
}}, }},
/* FIXME Radio tunes but only noise is heard */
.radio = { .radio = {
.type = CX88_RADIO, .type = CX88_RADIO,
.gpio0 = 0x84bf, .gpio0 = 0x84bf,
/* 4: FM Stereo (untested) */
.audioroute = 8,
}, },
.mpeg = CX88_MPEG_DVB, .mpeg = CX88_MPEG_DVB,
.num_frontends = 2, .num_frontends = 2,
...@@ -1365,23 +1369,27 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1365,23 +1369,27 @@ static const struct cx88_board cx88_boards[] = {
.type = CX88_VMUX_TELEVISION, .type = CX88_VMUX_TELEVISION,
.vmux = 0, .vmux = 0,
.gpio0 = 0xef88, .gpio0 = 0xef88,
/* 1: TV Audio / FM Mono */
.audioroute = 1, .audioroute = 1,
},{ },{
.type = CX88_VMUX_COMPOSITE1, .type = CX88_VMUX_COMPOSITE1,
.vmux = 1, .vmux = 1,
.gpio0 = 0xef88, .gpio0 = 0xef88,
/* 2: Line-In */
.audioroute = 2, .audioroute = 2,
},{ },{
.type = CX88_VMUX_SVIDEO, .type = CX88_VMUX_SVIDEO,
.vmux = 2, .vmux = 2,
.gpio0 = 0xef88, .gpio0 = 0xef88,
/* 2: Line-In */
.audioroute = 2, .audioroute = 2,
}}, }},
/* fixme: Add radio support */
.mpeg = CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD, .mpeg = CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD,
.radio = { .radio = {
.type = CX88_RADIO, .type = CX88_RADIO,
.gpio0 = 0xef88, .gpio0 = 0xef88,
/* 4: FM Stereo (untested) */
.audioroute = 8,
}, },
}, },
[CX88_BOARD_ADSTECH_PTV_390] = { [CX88_BOARD_ADSTECH_PTV_390] = {
...@@ -1755,27 +1763,38 @@ static const struct cx88_board cx88_boards[] = { ...@@ -1755,27 +1763,38 @@ static const struct cx88_board cx88_boards[] = {
* d 0 I * d 0 I
* e 1 O * e 1 O
* f 1 O * f 1 O
*
* WM8775 ADC
*
* 1: TV Audio / FM Mono
* 2: Line-In
* 3: Line-In Expansion
* 4: FM Stereo
*/ */
.input = {{ .input = {{
.type = CX88_VMUX_TELEVISION, .type = CX88_VMUX_TELEVISION,
.vmux = 0, .vmux = 0,
.gpio0 = 0xc4bf, .gpio0 = 0xc4bf,
/* 1: TV Audio / FM Mono */
.audioroute = 1, .audioroute = 1,
}, { }, {
.type = CX88_VMUX_COMPOSITE1, .type = CX88_VMUX_COMPOSITE1,
.vmux = 1, .vmux = 1,
.gpio0 = 0xc4bf, .gpio0 = 0xc4bf,
/* 2: Line-In */
.audioroute = 2, .audioroute = 2,
}, { }, {
.type = CX88_VMUX_SVIDEO, .type = CX88_VMUX_SVIDEO,
.vmux = 2, .vmux = 2,
.gpio0 = 0xc4bf, .gpio0 = 0xc4bf,
/* 2: Line-In */
.audioroute = 2, .audioroute = 2,
} }, } },
/* FIXME Radio tunes but only noise is heard */
.radio = { .radio = {
.type = CX88_RADIO, .type = CX88_RADIO,
.gpio0 = 0xc4bf, .gpio0 = 0xc4bf,
/* 4: FM Stereo */
.audioroute = 8,
}, },
.mpeg = CX88_MPEG_DVB, .mpeg = CX88_MPEG_DVB,
.num_frontends = 2, .num_frontends = 2,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment