change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/net/phy/mdio_device.c
..
..
@@ -1,16 +1,12 @@
1
+// SPDX-License-Identifier: GPL-2.0+
1
2
 /* Framework for MDIO devices, other than PHYs.
2
3
  *
3
4
  * Copyright (c) 2016 Andrew Lunn <andrew@lunn.ch>
4
- *
5
- * This program is free software; you can redistribute  it and/or modify it
6
- * under  the terms of  the GNU General  Public License as published by the
7
- * Free Software Foundation;  either version 2 of the  License, or (at your
8
- * option) any later version.
9
- *
10
5
  */
11
6
 
12
7
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
13
8
 
9
+#include <linux/delay.h>
14
10
 #include <linux/errno.h>
15
11
 #include <linux/gpio.h>
16
12
 #include <linux/gpio/consumer.h>
..
..
@@ -21,10 +17,10 @@
21
17
 #include <linux/mii.h>
22
18
 #include <linux/module.h>
23
19
 #include <linux/phy.h>
20
+#include <linux/reset.h>
24
21
 #include <linux/slab.h>
25
22
 #include <linux/string.h>
26
23
 #include <linux/unistd.h>
27
-#include <linux/delay.h>
28
24
 
29
25
 void mdio_device_free(struct mdio_device *mdiodev)
30
26
 {
..
..
@@ -121,14 +117,22 @@
121
117
 {
122
118
 	unsigned int d;
123
119
 
124
-	if (!mdiodev->reset)
120
+	if (!mdiodev->reset_gpio && !mdiodev->reset_ctrl)
125
121
 		return;
126
122
 
127
-	gpiod_set_value(mdiodev->reset, value);
123
+	if (mdiodev->reset_gpio)
124
+		gpiod_set_value_cansleep(mdiodev->reset_gpio, value);
125
+
126
+	if (mdiodev->reset_ctrl) {
127
+		if (value)
128
+			reset_control_assert(mdiodev->reset_ctrl);
129
+		else
130
+			reset_control_deassert(mdiodev->reset_ctrl);
131
+	}
128
132
 
129
133
 	d = value ? mdiodev->reset_assert_delay : mdiodev->reset_deassert_delay;
130
134
 	if (d)
131
-		usleep_range(d, d + max_t(unsigned int, d / 10, 100));
135
+		fsleep(d);
132
136
 }
133
137
 EXPORT_SYMBOL(mdio_device_reset);
134
138
 
..
..
@@ -146,10 +150,10 @@
146
150
 	struct mdio_driver *mdiodrv = to_mdio_driver(drv);
147
151
 	int err = 0;
148
152
 
149
-	if (mdiodrv->probe) {
150
-		/* Deassert the reset signal */
151
-		mdio_device_reset(mdiodev, 0);
153
+	/* Deassert the reset signal */
154
+	mdio_device_reset(mdiodev, 0);
152
155
 
156
+	if (mdiodrv->probe) {
153
157
 		err = mdiodrv->probe(mdiodev);
154
158
 		if (err) {
155
159
 			/* Assert the reset signal */
..
..
@@ -166,12 +170,11 @@
166
170
 	struct device_driver *drv = mdiodev->dev.driver;
167
171
 	struct mdio_driver *mdiodrv = to_mdio_driver(drv);
168
172
 
169
-	if (mdiodrv->remove) {
173
+	if (mdiodrv->remove)
170
174
 		mdiodrv->remove(mdiodev);
171
175
 
172
-		/* Assert the reset signal */
173
-		mdio_device_reset(mdiodev, 1);
174
-	}
176
+	/* Assert the reset signal */
177
+	mdio_device_reset(mdiodev, 1);
175
178
 
176
179
 	return 0;
177
180
 }
..
..
@@ -188,7 +191,7 @@
188
191
 
189
192
 /**
190
193
  * mdio_driver_register - register an mdio_driver with the MDIO layer
191
- * @new_driver: new mdio_driver to register
194
+ * @drv: new mdio_driver to register
192
195
  */
193
196
 int mdio_driver_register(struct mdio_driver *drv)
194
197
 {