media: cx23885: Fix various Hauppauge device analog capture inputs

Reports indicated S-Video capture did not work on HVR1265_K4, so all
devices on hand were audited and corrected to become fully
functional.

ImpactVCB-e
- Remove extraneous composite inputs
- Fix S-Video inputs

HVR5525
- Add routing and config for composite capture
- Add routing and config for S-Video capture
- Add routing for audio on both composite/S-Video

HVR1265_K4
- Remove non-existent composite capture
- Add routing and config for S-Video capture

Signed-off-by: Brad Love <brad@nextdimension.cc>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 03eee606af91528ca056e18ddce527c0a7c99a86..0160f909f38c2ddb0ac85c038e03b3e1a13c043b 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -657,14 +657,11 @@ struct cx23885_board cx23885_boards[] = {
                .porta          = CX23885_ANALOG_VIDEO,
                .input          = {{
                        .type   = CX23885_VMUX_COMPOSITE1,
-                       .vmux   = CX25840_VIN7_CH3 |
-                                 CX25840_VIN4_CH2 |
-                                 CX25840_VIN6_CH1,
+                       .vmux   = CX25840_VIN6_CH1,
                        .amux   = CX25840_AUDIO7,
                }, {
                        .type   = CX23885_VMUX_SVIDEO,
-                       .vmux   = CX25840_VIN7_CH3 |
-                                 CX25840_VIN4_CH2 |
+                       .vmux   = CX25840_VIN4_CH2 |
                                  CX25840_VIN8_CH1 |
                                  CX25840_SVIDEO_ON,
                        .amux   = CX25840_AUDIO7,
@@ -715,6 +712,16 @@ struct cx23885_board cx23885_boards[] = {
                                        CX25840_VIN2_CH1 |
                                        CX25840_DIF_ON,
                        .amux   = CX25840_AUDIO8,
+               }, {
+                       .type   = CX23885_VMUX_COMPOSITE1,
+                       .vmux   = CX25840_VIN6_CH1,
+                       .amux   = CX25840_AUDIO7,
+               }, {
+                       .type   = CX23885_VMUX_SVIDEO,
+                       .vmux   = CX25840_VIN7_CH3 |
+                                 CX25840_VIN8_CH1 |
+                                 CX25840_SVIDEO_ON,
+                       .amux   = CX25840_AUDIO7,
                } },
        },
        [CX23885_BOARD_VIEWCAST_260E] = {
@@ -822,17 +829,10 @@ struct cx23885_board cx23885_boards[] = {
                                        CX25840_VIN2_CH1 |
                                        CX25840_DIF_ON,
                        .amux   = CX25840_AUDIO8,
-               }, {
-                       .type   = CX23885_VMUX_COMPOSITE1,
-                       .vmux   =       CX25840_VIN7_CH3 |
-                                       CX25840_VIN4_CH2 |
-                                       CX25840_VIN6_CH1,
-                       .amux   = CX25840_AUDIO7,
                }, {
                        .type   = CX23885_VMUX_SVIDEO,
-                       .vmux   =       CX25840_VIN7_CH3 |
-                                       CX25840_VIN4_CH2 |
-                                       CX25840_VIN8_CH1 |
+                       .vmux   =       CX25840_VIN4_CH2 |
+                                       CX25840_VIN6_CH1 |
                                        CX25840_SVIDEO_ON,
                        .amux   = CX25840_AUDIO7,
                } },