update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm/mach-mediatek/mediatek.c
..
..
@@ -1,23 +1,15 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Device Tree support for Mediatek SoCs
3
4
  *
4
5
  * Copyright (c) 2014 MundoReader S.L.
5
6
  * Author: Matthias Brugger <matthias.bgg@gmail.com>
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, or
10
- * (at your option) any later version.
11
- *
12
- * This program is distributed in the hope that it will be useful,
13
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
- * GNU General Public License for more details.
16
7
  */
17
8
 #include <linux/init.h>
9
+#include <linux/io.h>
18
10
 #include <asm/mach/arch.h>
19
11
 #include <linux/of.h>
20
-#include <linux/clk-provider.h>
12
+#include <linux/of_clk.h>
21
13
 #include <linux/clocksource.h>
22
14
 
23
15
 
..
..
@@ -30,7 +22,6 @@
30
22
 
31
23
 	if (of_machine_is_compatible("mediatek,mt6589") ||
32
24
 	    of_machine_is_compatible("mediatek,mt7623") ||
33
-	    of_machine_is_compatible("mediatek,mt7623a") ||
34
25
 	    of_machine_is_compatible("mediatek,mt8135") ||
35
26
 	    of_machine_is_compatible("mediatek,mt8127")) {
36
27
 		/* turn on GPT6 which ungates arch timer clocks */
..
..
@@ -50,7 +41,7 @@
50
41
 	"mediatek,mt6589",
51
42
 	"mediatek,mt6592",
52
43
 	"mediatek,mt7623",
53
-	"mediatek,mt7623a",
44
+	"mediatek,mt7629",
54
45
 	"mediatek,mt8127",
55
46
 	"mediatek,mt8135",
56
47
 	NULL,