change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/watchdog/bcm2835_wdt.c
..
..
@@ -12,6 +12,7 @@
12
12
 
13
13
 #include <linux/delay.h>
14
14
 #include <linux/types.h>
15
+#include <linux/mfd/bcm2835-pm.h>
15
16
 #include <linux/module.h>
16
17
 #include <linux/io.h>
17
18
 #include <linux/watchdog.h>
..
..
@@ -46,6 +47,8 @@
46
47
 	void __iomem		*base;
47
48
 	spinlock_t		lock;
48
49
 };
50
+
51
+static struct bcm2835_wdt *bcm2835_power_off_wdt;
49
52
 
50
53
 static unsigned int heartbeat;
51
54
 static bool nowayout = WATCHDOG_NOWAYOUT;
..
..
@@ -148,10 +151,7 @@
148
151
  */
149
152
 static void bcm2835_power_off(void)
150
153
 {
151
-	struct device_node *np =
152
-		of_find_compatible_node(NULL, NULL, "brcm,bcm2835-pm-wdt");
153
-	struct platform_device *pdev = of_find_device_by_node(np);
154
-	struct bcm2835_wdt *wdt = platform_get_drvdata(pdev);
154
+	struct bcm2835_wdt *wdt = bcm2835_power_off_wdt;
155
155
 	u32 val;
156
156
 
157
157
 	/*
..
..
@@ -169,7 +169,7 @@
169
169
 
170
170
 static int bcm2835_wdt_probe(struct platform_device *pdev)
171
171
 {
172
-	struct resource *res;
172
+	struct bcm2835_pm *pm = dev_get_drvdata(pdev->dev.parent);
173
173
 	struct device *dev = &pdev->dev;
174
174
 	struct bcm2835_wdt *wdt;
175
175
 	int err;
..
..
@@ -177,14 +177,10 @@
177
177
 	wdt = devm_kzalloc(dev, sizeof(struct bcm2835_wdt), GFP_KERNEL);
178
178
 	if (!wdt)
179
179
 		return -ENOMEM;
180
-	platform_set_drvdata(pdev, wdt);
181
180
 
182
181
 	spin_lock_init(&wdt->lock);
183
182
 
184
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
185
-	wdt->base = devm_ioremap_resource(dev, res);
186
-	if (IS_ERR(wdt->base))
187
-		return PTR_ERR(wdt->base);
183
+	wdt->base = pm->base;
188
184
 
189
185
 	watchdog_set_drvdata(&bcm2835_wdt_wdd, wdt);
190
186
 	watchdog_init_timeout(&bcm2835_wdt_wdd, heartbeat, dev);
..
..
@@ -206,13 +202,13 @@
206
202
 
207
203
 	watchdog_stop_on_reboot(&bcm2835_wdt_wdd);
208
204
 	err = devm_watchdog_register_device(dev, &bcm2835_wdt_wdd);
209
-	if (err) {
210
-		dev_err(dev, "Failed to register watchdog device");
205
+	if (err)
211
206
 		return err;
212
-	}
213
207
 
214
-	if (pm_power_off == NULL)
208
+	if (pm_power_off == NULL) {
215
209
 		pm_power_off = bcm2835_power_off;
210
+		bcm2835_power_off_wdt = wdt;
211
+	}
216
212
 
217
213
 	dev_info(dev, "Broadcom BCM2835 watchdog timer");
218
214
 	return 0;
..
..
@@ -226,18 +222,11 @@
226
222
 	return 0;
227
223
 }
228
224
 
229
-static const struct of_device_id bcm2835_wdt_of_match[] = {
230
-	{ .compatible = "brcm,bcm2835-pm-wdt", },
231
-	{},
232
-};
233
-MODULE_DEVICE_TABLE(of, bcm2835_wdt_of_match);
234
-
235
225
 static struct platform_driver bcm2835_wdt_driver = {
236
226
 	.probe		= bcm2835_wdt_probe,
237
227
 	.remove		= bcm2835_wdt_remove,
238
228
 	.driver = {
239
229
 		.name =		"bcm2835-wdt",
240
-		.of_match_table = bcm2835_wdt_of_match,
241
230
 	},
242
231
 };
243
232
 module_platform_driver(bcm2835_wdt_driver);