mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/net/phy/cortina.c
..
..
@@ -1,15 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0+
1
2
 /*
2
3
  *    Copyright 2017 NXP
3
- *
4
- *    This program is free software; you can redistribute it and/or modify
5
- *    it under the terms of the GNU General Public License as published by
6
- *    the Free Software Foundation; either version 2 of the License, or
7
- *    (at your option) any later version.
8
- *
9
- *    This program is distributed in the hope that it will be useful,
10
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
11
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
- *    GNU General Public License for more details.
13
4
  *
14
5
  *    CORTINA is a registered trademark of Cortina Systems, Inc.
15
6
  *
..
..
@@ -26,8 +17,7 @@
26
17
 
27
18
 static int cortina_read_reg(struct phy_device *phydev, u16 regnum)
28
19
 {
29
-	return mdiobus_read(phydev->mdio.bus, phydev->mdio.addr,
30
-			    MII_ADDR_C45 | regnum);
20
+	return mdiobus_c45_read(phydev->mdio.bus, phydev->mdio.addr, 0, regnum);
31
21
 }
32
22
 
33
23
 static int cortina_read_status(struct phy_device *phydev)
..
..
@@ -88,10 +78,9 @@
88
78
 	.phy_id		= PHY_ID_CS4340,
89
79
 	.phy_id_mask	= 0xffffffff,
90
80
 	.name		= "Cortina CS4340",
91
-	.config_init	= gen10g_config_init,
81
+	.features       = PHY_10GBIT_FEATURES,
92
82
 	.config_aneg	= gen10g_config_aneg,
93
83
 	.read_status	= cortina_read_status,
94
-	.soft_reset	= gen10g_no_soft_reset,
95
84
 	.probe		= cortina_probe,
96
85
 },
97
86
 };