update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
..
..
@@ -1,43 +1,7 @@
1
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
1
2
 /*
2
- * Copyright (c) 2016 Fuzhou Rockchip Electronics Co., Ltd
3
+ * Copyright (c) 2022 Rockchip Electronics Co., Ltd.
3
4
  *
4
- * This file is dual-licensed: you can use it either under the terms
5
- * of the GPL or the X11 license, at your option. Note that this dual
6
- * licensing only applies to this file, and not this project as a
7
- * whole.
8
- *
9
- *  a) This file is free software; you can redistribute it and/or
10
- *     modify it under the terms of the GNU General Public License as
11
- *     published by the Free Software Foundation; either version 2 of the
12
- *     License, or (at your option) any later version.
13
- *
14
- *     This file is distributed in the hope that it will be useful,
15
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
16
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
17
- *     GNU General Public License for more details.
18
- *
19
- * Or, alternatively,
20
- *
21
- *  b) Permission is hereby granted, free of charge, to any person
22
- *     obtaining a copy of this software and associated documentation
23
- *     files (the "Software"), to deal in the Software without
24
- *     restriction, including without limitation the rights to use,
25
- *     copy, modify, merge, publish, distribute, sublicense, and/or
26
- *     sell copies of the Software, and to permit persons to whom the
27
- *     Software is furnished to do so, subject to the following
28
- *     conditions:
29
- *
30
- *     The above copyright notice and this permission notice shall be
31
- *     included in all copies or substantial portions of the Software.
32
- *
33
- *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
34
- *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
35
- *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
36
- *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
37
- *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
38
- *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
39
- *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
40
- *     OTHER DEALINGS IN THE SOFTWARE.
41
5
  */
42
6
 
43
7
 /dts-v1/;
..
..
@@ -53,7 +17,7 @@
53
17
 / {
54
18
 	compatible = "rockchip,rk3399-mid", "rockchip,rk3399";
55
19
 	chosen: chosen {
56
-		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 androidboot.baseband=N/A androidboot.veritymode=enforcing androidboot.hardware=rk30board androidboot.console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
20
+		bootargs = "earlycon=uart8250,mmio32,0xff1a0000 console=ttyFIQ0 init=/init initrd=0x62000001,0x00800000 coherent_pool=1m";
57
21
 	};
58
22
 
59
23
 	adc_keys {
..
..
@@ -240,6 +204,7 @@
240
204
 	spdif-sound {
241
205
 		compatible = "simple-audio-card";
242
206
 		simple-audio-card,name = "rockchip,spdif";
207
+		simple-audio-card,mclk-fs = <128>;
243
208
 		simple-audio-card,cpu {
244
209
 			sound-dai = <&spdif>;
245
210
 		};
..
..
@@ -338,7 +303,8 @@
338
303
 &sdmmc {
339
304
 	clock-frequency = <50000000>;
340
305
 	clock-freq-min-max = <400000 150000000>;
341
-	supports-sd;
306
+	no-sdio;
307
+	no-mmc;
342
308
 	bus-width = <4>;
343
309
 	cap-mmc-highspeed;
344
310
 	cap-sd-highspeed;
..
..
@@ -354,7 +320,8 @@
354
320
 &sdio0 {
355
321
 	clock-frequency = <150000000>;
356
322
 	clock-freq-min-max = <200000 150000000>;
357
-	supports-sdio;
323
+	no-sd;
324
+	no-mmc;
358
325
 	bus-width = <4>;
359
326
 	disable-wp;
360
327
 	cap-sd-highspeed;
..
..
@@ -376,7 +343,8 @@
376
343
 &sdhci {
377
344
 	bus-width = <8>;
378
345
 	mmc-hs400-1_8v;
379
-	supports-emmc;
346
+	no-sdio;
347
+	no-sd;
380
348
 	non-removable;
381
349
 	keep-power-in-suspend;
382
350
 	mmc-hs400-enhanced-strobe;