update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c
..
..
@@ -1,18 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
- *
3
3
  *
4
4
  *  Copyright (C) 2005 Mike Isely <isely@pobox.com>
5
5
  *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
6
- *
7
- *  This program is free software; you can redistribute it and/or modify
8
- *  it under the terms of the GNU General Public License as published by
9
- *  the Free Software Foundation; either version 2 of the License
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
- *  GNU General Public License for more details.
15
- *
16
6
  */
17
7
 
18
8
 /*
..
..
@@ -111,10 +101,35 @@
111
101
 	.cnt = ARRAY_SIZE(routing_schemeav400),
112
102
 };
113
103
 
104
+static const struct routing_scheme_item routing_scheme160xxx[] = {
105
+	[PVR2_CVAL_INPUT_TV] = {
106
+		.vid = CX25840_COMPOSITE7,
107
+		.aud = CX25840_AUDIO8,
108
+	},
109
+	[PVR2_CVAL_INPUT_RADIO] = {
110
+		.vid = CX25840_COMPOSITE4,
111
+		.aud = CX25840_AUDIO6,
112
+	},
113
+	[PVR2_CVAL_INPUT_COMPOSITE] = {
114
+		.vid = CX25840_COMPOSITE3,
115
+		.aud = CX25840_AUDIO_SERIAL,
116
+	},
117
+	[PVR2_CVAL_INPUT_SVIDEO] = {
118
+		.vid = CX25840_SVIDEO1,
119
+		.aud = CX25840_AUDIO_SERIAL,
120
+	},
121
+};
122
+
123
+static const struct routing_scheme routing_def160xxx = {
124
+	.def = routing_scheme160xxx,
125
+	.cnt = ARRAY_SIZE(routing_scheme160xxx),
126
+};
127
+
114
128
 static const struct routing_scheme *routing_schemes[] = {
115
129
 	[PVR2_ROUTING_SCHEME_HAUPPAUGE] = &routing_def0,
116
130
 	[PVR2_ROUTING_SCHEME_GOTVIEW] = &routing_defgv,
117
131
 	[PVR2_ROUTING_SCHEME_AV400] = &routing_defav400,
132
+	[PVR2_ROUTING_SCHEME_HAUP160XXX] = &routing_def160xxx,
118
133
 };
119
134
 
120
135
 void pvr2_cx25840_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)