update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/pci/saa7134/saa7134-cards.c
..
..
@@ -1,19 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *
3
4
  * device driver for philips saa7134 based TV cards
4
5
  * card-specific stuff.
5
6
  *
6
7
  * (c) 2001-04 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
7
- *
8
- *  This program is free software; you can redistribute it and/or modify
9
- *  it under the terms of the GNU General Public License as published by
10
- *  the Free Software Foundation; either version 2 of the License, or
11
- *  (at your option) any later version.
12
- *
13
- *  This program is distributed in the hope that it will be useful,
14
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
15
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
- *  GNU General Public License for more details.
17
8
  */
18
9
 
19
10
 #include "saa7134.h"
..
..
@@ -3628,6 +3619,21 @@
3628
3619
 			.vmux   = 1,
3629
3620
 			.amux   = TV,
3630
3621
 			.gpio   = 0x0200000,
3622
+		},{
3623
+			.type = SAA7134_INPUT_COMPOSITE1,
3624
+			.vmux = 3,
3625
+			.amux = LINE2,
3626
+			.gpio = 0x0200000,
3627
+		},{
3628
+			.type = SAA7134_INPUT_COMPOSITE2,
3629
+			.vmux = 0,
3630
+			.amux = LINE2,
3631
+			.gpio = 0x0200000,
3632
+		},{
3633
+			.type = SAA7134_INPUT_SVIDEO,
3634
+			.vmux = 8,
3635
+			.amux = LINE2,
3636
+			.gpio = 0x0200000,
3631
3637
 		}},
3632
3638
 	},
3633
3639
 	[SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA] = {
..
..
@@ -6408,7 +6414,7 @@
6408
6414
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
6409
6415
 		.device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
6410
6416
 		.subvendor    = 0x5168,
6411
-		.subdevice    = 0x3502,  /* whats the difference to 0x3306 ?*/
6417
+		.subdevice    = 0x3502,  /* what's the difference to 0x3306 ?*/
6412
6418
 		.driver_data  = SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS,
6413
6419
 	},{
6414
6420
 		.vendor       = PCI_VENDOR_ID_PHILIPS,
..
..
@@ -7806,7 +7812,7 @@
7806
7812
 				dev->name, saa7134_boards[dev->board].name);
7807
7813
 			break;
7808
7814
 		}
7809
-		/* fall-through */
7815
+		fallthrough;
7810
7816
 	case SAA7134_BOARD_VIDEOMATE_DVBT_300:
7811
7817
 	case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
7812
7818
 	case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
..
..
@@ -7864,7 +7870,7 @@
7864
7870
 		break;
7865
7871
 	case SAA7134_BOARD_HAUPPAUGE_HVR1110:
7866
7872
 		hauppauge_eeprom(dev, dev->eedata+0x80);
7867
-		/* fall-through */
7873
+		fallthrough;
7868
7874
 	case SAA7134_BOARD_PINNACLE_PCTV_310i:
7869
7875
 	case SAA7134_BOARD_KWORLD_DVBT_210:
7870
7876
 	case SAA7134_BOARD_TEVION_DVBT_220RF: