Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 649e13a95bb2aec489cc3194034a15a6e2916448

Authored by Darron Broad
Committed by Mauro Carvalho Chehab
1 parent e43f3fab05
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

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: Darron Broad <darron@kewl.org>
Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 1 changed file with 22 additions and 3 deletions Side-by-side Diff

drivers/media/video/cx88/cx88-cards.c
Diff comments   View file @ 649e13a
... ... @@ -1281,22 +1281,26 @@
1281 1281 .type = CX88_VMUX_TELEVISION,
1282 1282 .vmux = 0,
1283 1283 .gpio0 = 0x84bf,
  1284 + /* 1: TV Audio / FM Mono */
1284 1285 .audioroute = 1,
1285 1286 },{
1286 1287 .type = CX88_VMUX_COMPOSITE1,
1287 1288 .vmux = 1,
1288 1289 .gpio0 = 0x84bf,
  1290 + /* 2: Line-In */
1289 1291 .audioroute = 2,
1290 1292 },{
1291 1293 .type = CX88_VMUX_SVIDEO,
1292 1294 .vmux = 2,
1293 1295 .gpio0 = 0x84bf,
  1296 + /* 2: Line-In */
1294 1297 .audioroute = 2,
1295 1298 }},
1296   - /* FIXME Radio tunes but only noise is heard */
1297 1299 .radio = {
1298 1300 .type = CX88_RADIO,
1299 1301 .gpio0 = 0x84bf,
  1302 + /* 4: FM Stereo (untested) */
  1303 + .audioroute = 8,
1300 1304 },
1301 1305 .mpeg = CX88_MPEG_DVB,
1302 1306 .num_frontends = 2,
1303 1307  
1304 1308  
1305 1309  
1306 1310  
... ... @@ -1365,23 +1369,27 @@
1365 1369 .type = CX88_VMUX_TELEVISION,
1366 1370 .vmux = 0,
1367 1371 .gpio0 = 0xef88,
  1372 + /* 1: TV Audio / FM Mono */
1368 1373 .audioroute = 1,
1369 1374 },{
1370 1375 .type = CX88_VMUX_COMPOSITE1,
1371 1376 .vmux = 1,
1372 1377 .gpio0 = 0xef88,
  1378 + /* 2: Line-In */
1373 1379 .audioroute = 2,
1374 1380 },{
1375 1381 .type = CX88_VMUX_SVIDEO,
1376 1382 .vmux = 2,
1377 1383 .gpio0 = 0xef88,
  1384 + /* 2: Line-In */
1378 1385 .audioroute = 2,
1379 1386 }},
1380   - /* fixme: Add radio support */
1381 1387 .mpeg = CX88_MPEG_DVB | CX88_MPEG_BLACKBIRD,
1382 1388 .radio = {
1383 1389 .type = CX88_RADIO,
1384 1390 .gpio0 = 0xef88,
  1391 + /* 4: FM Stereo (untested) */
  1392 + .audioroute = 8,
1385 1393 },
1386 1394 },
1387 1395 [CX88_BOARD_ADSTECH_PTV_390] = {
1388 1396  
1389 1397  
1390 1398  
1391 1399  
1392 1400  
... ... @@ -1755,27 +1763,38 @@
1755 1763 * d 0 I
1756 1764 * e 1 O
1757 1765 * f 1 O
  1766 + *
  1767 + * WM8775 ADC
  1768 + *
  1769 + * 1: TV Audio / FM Mono
  1770 + * 2: Line-In
  1771 + * 3: Line-In Expansion
  1772 + * 4: FM Stereo
1758 1773 */
1759 1774 .input = {{
1760 1775 .type = CX88_VMUX_TELEVISION,
1761 1776 .vmux = 0,
1762 1777 .gpio0 = 0xc4bf,
  1778 + /* 1: TV Audio / FM Mono */
1763 1779 .audioroute = 1,
1764 1780 }, {
1765 1781 .type = CX88_VMUX_COMPOSITE1,
1766 1782 .vmux = 1,
1767 1783 .gpio0 = 0xc4bf,
  1784 + /* 2: Line-In */
1768 1785 .audioroute = 2,
1769 1786 }, {
1770 1787 .type = CX88_VMUX_SVIDEO,
1771 1788 .vmux = 2,
1772 1789 .gpio0 = 0xc4bf,
  1790 + /* 2: Line-In */
1773 1791 .audioroute = 2,
1774 1792 } },
1775   - /* FIXME Radio tunes but only noise is heard */
1776 1793 .radio = {
1777 1794 .type = CX88_RADIO,
1778 1795 .gpio0 = 0xc4bf,
  1796 + /* 4: FM Stereo */
  1797 + .audioroute = 8,
1779 1798 },
1780 1799 .mpeg = CX88_MPEG_DVB,
1781 1800 .num_frontends = 2,