hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/media/pci/cx23885/cx23885-cards.c
....@@ -1,18 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * Driver for the Conexant CX23885 PCIe bridge
34 *
45 * Copyright (c) 2006 Steven Toth <stoth@linuxtv.org>
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation; either version 2 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- *
15
- * GNU General Public License for more details.
166 */
177
188 #include "cx23885.h"
....@@ -713,8 +703,19 @@
713703 },
714704 [CX23885_BOARD_HAUPPAUGE_HVR5525] = {
715705 .name = "Hauppauge WinTV-HVR5525",
706
+ .porta = CX23885_ANALOG_VIDEO,
716707 .portb = CX23885_MPEG_DVB,
717708 .portc = CX23885_MPEG_DVB,
709
+ .tuner_type = TUNER_ABSENT,
710
+ .force_bff = 1,
711
+ .input = {{
712
+ .type = CX23885_VMUX_TELEVISION,
713
+ .vmux = CX25840_VIN7_CH3 |
714
+ CX25840_VIN5_CH2 |
715
+ CX25840_VIN2_CH1 |
716
+ CX25840_DIF_ON,
717
+ .amux = CX25840_AUDIO8,
718
+ } },
718719 },
719720 [CX23885_BOARD_VIEWCAST_260E] = {
720721 .name = "ViewCast 260e",
....@@ -767,32 +768,61 @@
767768 } },
768769 },
769770 [CX23885_BOARD_HAUPPAUGE_QUADHD_DVB] = {
770
- .name = "Hauppauge WinTV-QuadHD-DVB",
771
+ .name = "Hauppauge WinTV-QuadHD-DVB",
772
+ .porta = CX23885_ANALOG_VIDEO,
771773 .portb = CX23885_MPEG_DVB,
772774 .portc = CX23885_MPEG_DVB,
775
+ .tuner_type = TUNER_ABSENT,
776
+ .force_bff = 1,
777
+ .input = {{
778
+ .type = CX23885_VMUX_TELEVISION,
779
+ .vmux = CX25840_VIN7_CH3 |
780
+ CX25840_VIN5_CH2 |
781
+ CX25840_VIN2_CH1 |
782
+ CX25840_DIF_ON,
783
+ .amux = CX25840_AUDIO8,
784
+ } },
773785 },
774786 [CX23885_BOARD_HAUPPAUGE_QUADHD_DVB_885] = {
775
- .name = "Hauppauge WinTV-QuadHD-DVB(885)",
787
+ .name = "Hauppauge WinTV-QuadHD-DVB(885)",
776788 .portb = CX23885_MPEG_DVB,
777789 .portc = CX23885_MPEG_DVB,
790
+ .tuner_type = TUNER_ABSENT,
778791 },
779792 [CX23885_BOARD_HAUPPAUGE_QUADHD_ATSC] = {
780
- .name = "Hauppauge WinTV-QuadHD-ATSC",
793
+ .name = "Hauppauge WinTV-QuadHD-ATSC",
794
+ .porta = CX23885_ANALOG_VIDEO,
781795 .portb = CX23885_MPEG_DVB,
782796 .portc = CX23885_MPEG_DVB,
797
+ .tuner_type = TUNER_ABSENT,
798
+ .input = {{
799
+ .type = CX23885_VMUX_TELEVISION,
800
+ .vmux = CX25840_VIN7_CH3 |
801
+ CX25840_VIN5_CH2 |
802
+ CX25840_VIN2_CH1 |
803
+ CX25840_DIF_ON,
804
+ .amux = CX25840_AUDIO8,
805
+ } },
783806 },
784807 [CX23885_BOARD_HAUPPAUGE_QUADHD_ATSC_885] = {
785
- .name = "Hauppauge WinTV-QuadHD-ATSC(885)",
808
+ .name = "Hauppauge WinTV-QuadHD-ATSC(885)",
786809 .portb = CX23885_MPEG_DVB,
787810 .portc = CX23885_MPEG_DVB,
811
+ .tuner_type = TUNER_ABSENT,
788812 },
789813 [CX23885_BOARD_HAUPPAUGE_HVR1265_K4] = {
790814 .name = "Hauppauge WinTV-HVR-1265(161111)",
791815 .porta = CX23885_ANALOG_VIDEO,
792816 .portc = CX23885_MPEG_DVB,
793817 .tuner_type = TUNER_ABSENT,
794
- .force_bff = 1,
795818 .input = {{
819
+ .type = CX23885_VMUX_TELEVISION,
820
+ .vmux = CX25840_VIN7_CH3 |
821
+ CX25840_VIN5_CH2 |
822
+ CX25840_VIN2_CH1 |
823
+ CX25840_DIF_ON,
824
+ .amux = CX25840_AUDIO8,
825
+ }, {
796826 .type = CX23885_VMUX_COMPOSITE1,
797827 .vmux = CX25840_VIN7_CH3 |
798828 CX25840_VIN4_CH2 |
....@@ -2179,7 +2209,7 @@
21792209 ts2->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */
21802210 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
21812211 ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
2182
- /* fall-through */
2212
+ fallthrough;
21832213 case CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP:
21842214 ts1->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */
21852215 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
....@@ -2340,7 +2370,7 @@
23402370 /* Currently only enabled for the integrated IR controller */
23412371 if (!enable_885_ir)
23422372 break;
2343
- /* fall-through */
2373
+ fallthrough;
23442374 case CX23885_BOARD_HAUPPAUGE_HVR1250:
23452375 case CX23885_BOARD_HAUPPAUGE_HVR1800:
23462376 case CX23885_BOARD_HAUPPAUGE_IMPACTVCBE:
....@@ -2360,6 +2390,7 @@
23602390 case CX23885_BOARD_HAUPPAUGE_QUADHD_ATSC:
23612391 case CX23885_BOARD_HAUPPAUGE_HVR1270:
23622392 case CX23885_BOARD_HAUPPAUGE_HVR1850:
2393
+ case CX23885_BOARD_HAUPPAUGE_HVR5525:
23632394 case CX23885_BOARD_MYGICA_X8506:
23642395 case CX23885_BOARD_MAGICPRO_PROHDTVE2:
23652396 case CX23885_BOARD_HAUPPAUGE_HVR1290: