update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/mips/ar7/platform.c
..
..
@@ -1,20 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Copyright (C) 2006,2007 Felix Fietkau <nbd@openwrt.org>
3
4
  * Copyright (C) 2006,2007 Eugene Konev <ejka@openwrt.org>
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License as published by
7
- * the Free Software Foundation; either version 2 of the License, or
8
- * (at your option) any later version.
9
- *
10
- * This program is distributed in the hope that it will be useful,
11
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
- * GNU General Public License for more details.
14
- *
15
- * You should have received a copy of the GNU General Public License
16
- * along with this program; if not, write to the Free Software
17
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
5
  */
19
6
 
20
7
 #include <linux/init.h>
..
..
@@ -683,7 +670,7 @@
683
670
 
684
671
 	if (ar7_has_high_cpmac()) {
685
672
 		res = fixed_phy_add(PHY_POLL, cpmac_high.id,
686
-				    &fixed_phy_status, -1);
673
+				    &fixed_phy_status);
687
674
 		if (!res) {
688
675
 			cpmac_get_mac(1, cpmac_high_data.dev_addr);
689
676
 
..
..
@@ -696,7 +683,7 @@
696
683
 	} else
697
684
 		cpmac_low_data.phy_mask = 0xffffffff;
698
685
 
699
-	res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status, -1);
686
+	res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status);
700
687
 	if (!res) {
701
688
 		cpmac_get_mac(0, cpmac_low_data.dev_addr);
702
689
 		res = platform_device_register(&cpmac_low);
..
..
@@ -715,7 +702,7 @@
715
702
 		pr_warn("unable to register usb slave: %d\n", res);
716
703
 
717
704
 	/* Register watchdog only if enabled in hardware */
718
-	bootcr = ioremap_nocache(AR7_REGS_DCL, 4);
705
+	bootcr = ioremap(AR7_REGS_DCL, 4);
719
706
 	val = readl(bootcr);
720
707
 	iounmap(bootcr);
721
708
 	if (val & AR7_WDT_HW_ENA) {