change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/watchdog/mena21_wdt.c
..
..
@@ -13,10 +13,10 @@
13
13
 #include <linux/platform_device.h>
14
14
 #include <linux/watchdog.h>
15
15
 #include <linux/uaccess.h>
16
-#include <linux/gpio.h>
17
-#include <linux/of_gpio.h>
16
+#include <linux/gpio/consumer.h>
18
17
 #include <linux/delay.h>
19
18
 #include <linux/bitops.h>
19
+#include <linux/of.h>
20
20
 
21
21
 #define NUM_GPIOS 6
22
22
 
..
..
@@ -31,7 +31,7 @@
31
31
 
32
32
 struct a21_wdt_drv {
33
33
 	struct watchdog_device wdt;
34
-	unsigned gpios[NUM_GPIOS];
34
+	struct gpio_desc *gpios[NUM_GPIOS];
35
35
 };
36
36
 
37
37
 static bool nowayout = WATCHDOG_NOWAYOUT;
..
..
@@ -43,9 +43,9 @@
43
43
 {
44
44
 	int reset = 0;
45
45
 
46
-	reset |= gpio_get_value(drv->gpios[GPIO_WD_RST0]) ? (1 << 0) : 0;
47
-	reset |= gpio_get_value(drv->gpios[GPIO_WD_RST1]) ? (1 << 1) : 0;
48
-	reset |= gpio_get_value(drv->gpios[GPIO_WD_RST2]) ? (1 << 2) : 0;
46
+	reset |= gpiod_get_value(drv->gpios[GPIO_WD_RST0]) ? (1 << 0) : 0;
47
+	reset |= gpiod_get_value(drv->gpios[GPIO_WD_RST1]) ? (1 << 1) : 0;
48
+	reset |= gpiod_get_value(drv->gpios[GPIO_WD_RST2]) ? (1 << 2) : 0;
49
49
 
50
50
 	return reset;
51
51
 }
..
..
@@ -54,7 +54,7 @@
54
54
 {
55
55
 	struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
56
56
 
57
-	gpio_set_value(drv->gpios[GPIO_WD_ENAB], 1);
57
+	gpiod_set_value(drv->gpios[GPIO_WD_ENAB], 1);
58
58
 
59
59
 	return 0;
60
60
 }
..
..
@@ -63,7 +63,7 @@
63
63
 {
64
64
 	struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
65
65
 
66
-	gpio_set_value(drv->gpios[GPIO_WD_ENAB], 0);
66
+	gpiod_set_value(drv->gpios[GPIO_WD_ENAB], 0);
67
67
 
68
68
 	return 0;
69
69
 }
..
..
@@ -72,9 +72,9 @@
72
72
 {
73
73
 	struct a21_wdt_drv *drv = watchdog_get_drvdata(wdt);
74
74
 
75
-	gpio_set_value(drv->gpios[GPIO_WD_TRIG], 0);
75
+	gpiod_set_value(drv->gpios[GPIO_WD_TRIG], 0);
76
76
 	ndelay(10);
77
-	gpio_set_value(drv->gpios[GPIO_WD_TRIG], 1);
77
+	gpiod_set_value(drv->gpios[GPIO_WD_TRIG], 1);
78
78
 
79
79
 	return 0;
80
80
 }
..
..
@@ -96,9 +96,9 @@
96
96
 	}
97
97
 
98
98
 	if (timeout == 1)
99
-		gpio_set_value(drv->gpios[GPIO_WD_FAST], 1);
99
+		gpiod_set_value(drv->gpios[GPIO_WD_FAST], 1);
100
100
 	else
101
-		gpio_set_value(drv->gpios[GPIO_WD_FAST], 0);
101
+		gpiod_set_value(drv->gpios[GPIO_WD_FAST], 0);
102
102
 
103
103
 	wdt->timeout = timeout;
104
104
 
..
..
@@ -127,57 +127,54 @@
127
127
 
128
128
 static int a21_wdt_probe(struct platform_device *pdev)
129
129
 {
130
-	struct device_node *node;
130
+	struct device *dev = &pdev->dev;
131
131
 	struct a21_wdt_drv *drv;
132
132
 	unsigned int reset = 0;
133
133
 	int num_gpios;
134
134
 	int ret;
135
135
 	int i;
136
136
 
137
-	drv = devm_kzalloc(&pdev->dev, sizeof(struct a21_wdt_drv), GFP_KERNEL);
137
+	drv = devm_kzalloc(dev, sizeof(struct a21_wdt_drv), GFP_KERNEL);
138
138
 	if (!drv)
139
139
 		return -ENOMEM;
140
140
 
141
-	/* Fill GPIO pin array */
142
-	node = pdev->dev.of_node;
143
-
144
-	num_gpios = of_gpio_count(node);
141
+	num_gpios = gpiod_count(dev, NULL);
145
142
 	if (num_gpios != NUM_GPIOS) {
146
-		dev_err(&pdev->dev, "gpios DT property wrong, got %d want %d",
143
+		dev_err(dev, "gpios DT property wrong, got %d want %d",
147
144
 			num_gpios, NUM_GPIOS);
148
145
 		return -ENODEV;
149
146
 	}
150
147
 
151
-	for (i = 0; i < num_gpios; i++) {
152
-		int val;
153
-
154
-		val = of_get_gpio(node, i);
155
-		if (val < 0)
156
-			return val;
157
-
158
-		drv->gpios[i] = val;
159
-	}
160
-
161
148
 	/* Request the used GPIOs */
162
149
 	for (i = 0; i < num_gpios; i++) {
163
-		ret = devm_gpio_request(&pdev->dev, drv->gpios[i],
164
-					"MEN A21 Watchdog");
165
-		if (ret)
166
-			return ret;
150
+		enum gpiod_flags gflags;
167
151
 
168
152
 		if (i < GPIO_WD_RST0)
169
-			ret = gpio_direction_output(drv->gpios[i],
170
-						gpio_get_value(drv->gpios[i]));
171
-		else		/* GPIO_WD_RST[0..2] are inputs */
172
-			ret = gpio_direction_input(drv->gpios[i]);
173
-		if (ret)
174
-			return ret;
153
+			gflags = GPIOD_ASIS;
154
+		else
155
+			gflags = GPIOD_IN;
156
+		drv->gpios[i] = devm_gpiod_get_index(dev, NULL, i, gflags);
157
+		if (IS_ERR(drv->gpios[i]))
158
+			return PTR_ERR(drv->gpios[i]);
159
+
160
+		gpiod_set_consumer_name(drv->gpios[i], "MEN A21 Watchdog");
161
+
162
+		/*
163
+		 * Retrieve the initial value from the GPIOs that should be
164
+		 * output, then set up the line as output with that value.
165
+		 */
166
+		if (i < GPIO_WD_RST0) {
167
+			int val;
168
+
169
+			val = gpiod_get_value(drv->gpios[i]);
170
+			gpiod_direction_output(drv->gpios[i], val);
171
+		}
175
172
 	}
176
173
 
177
-	watchdog_init_timeout(&a21_wdt, 30, &pdev->dev);
174
+	watchdog_init_timeout(&a21_wdt, 30, dev);
178
175
 	watchdog_set_nowayout(&a21_wdt, nowayout);
179
176
 	watchdog_set_drvdata(&a21_wdt, drv);
180
-	a21_wdt.parent = &pdev->dev;
177
+	a21_wdt.parent = dev;
181
178
 
182
179
 	reset = a21_wdt_get_bootstatus(drv);
183
180
 	if (reset == 2)
..
..
@@ -190,15 +187,13 @@
190
187
 		a21_wdt.bootstatus |= WDIOF_EXTERN2;
191
188
 
192
189
 	drv->wdt = a21_wdt;
193
-	dev_set_drvdata(&pdev->dev, drv);
190
+	dev_set_drvdata(dev, drv);
194
191
 
195
-	ret = devm_watchdog_register_device(&pdev->dev, &a21_wdt);
196
-	if (ret) {
197
-		dev_err(&pdev->dev, "Cannot register watchdog device\n");
192
+	ret = devm_watchdog_register_device(dev, &a21_wdt);
193
+	if (ret)
198
194
 		return ret;
199
-	}
200
195
 
201
-	dev_info(&pdev->dev, "MEN A21 watchdog timer driver enabled\n");
196
+	dev_info(dev, "MEN A21 watchdog timer driver enabled\n");
202
197
 
203
198
 	return 0;
204
199
 }
..
..
@@ -207,7 +202,7 @@
207
202
 {
208
203
 	struct a21_wdt_drv *drv = dev_get_drvdata(&pdev->dev);
209
204
 
210
-	gpio_set_value(drv->gpios[GPIO_WD_ENAB], 0);
205
+	gpiod_set_value(drv->gpios[GPIO_WD_ENAB], 0);
211
206
 }
212
207
 
213
208
 static const struct of_device_id a21_wdt_ids[] = {