update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
..
..
@@ -1,47 +1,7 @@
1
-/*
2
- * Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.xyz>
3
- *
4
- * Based on sun50i-h5-orangepi-pc2.dts, which is:
5
- *   Copyright (C) 2016 ARM Ltd.
6
- *
7
- * This file is dual-licensed: you can use it either under the terms
8
- * of the GPL or the X11 license, at your option. Note that this dual
9
- * licensing only applies to this file, and not this project as a
10
- * whole.
11
- *
12
- *  a) This file is free software; you can redistribute it and/or
13
- *     modify it under the terms of the GNU General Public License as
14
- *     published by the Free Software Foundation; either version 2 of the
15
- *     License, or (at your option) any later version.
16
- *
17
- *     This file is distributed in the hope that it will be useful,
18
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
19
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
20
- *     GNU General Public License for more details.
21
- *
22
- * Or, alternatively,
23
- *
24
- *  b) Permission is hereby granted, free of charge, to any person
25
- *     obtaining a copy of this software and associated documentation
26
- *     files (the "Software"), to deal in the Software without
27
- *     restriction, including without limitation the rights to use,
28
- *     copy, modify, merge, publish, distribute, sublicense, and/or
29
- *     sell copies of the Software, and to permit persons to whom the
30
- *     Software is furnished to do so, subject to the following
31
- *     conditions:
32
- *
33
- *     The above copyright notice and this permission notice shall be
34
- *     included in all copies or substantial portions of the Software.
35
- *
36
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
37
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
38
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
39
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
40
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
41
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
42
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
43
- *     OTHER DEALINGS IN THE SOFTWARE.
44
- */
1
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2
+// Copyright (C) 2017 Icenowy Zheng <icenowy@aosc.xyz>
3
+// Based on sun50i-h5-orangepi-pc2.dts, which is:
4
+//   Copyright (C) 2016 ARM Ltd.
45
5
 
46
6
 /dts-v1/;
47
7
 #include "sun50i-h5.dtsi"
..
..
@@ -187,7 +147,7 @@
187
147
 
188
148
 &ir {
189
149
 	pinctrl-names = "default";
190
-	pinctrl-0 = <&ir_pins_a>;
150
+	pinctrl-0 = <&r_ir_rx_pin>;
191
151
 	status = "okay";
192
152
 };
193
153
 
..
..
@@ -224,7 +184,7 @@
224
184
 
225
185
 &uart0 {
226
186
 	pinctrl-names = "default";
227
-	pinctrl-0 = <&uart0_pins_a>;
187
+	pinctrl-0 = <&uart0_pa_pins>;
228
188
 	status = "okay";
229
189
 };
230
190