update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/rtc/rtc-stmp3xxx.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0+
1
2
 /*
2
3
  * Freescale STMP37XX/STMP378X Real Time Clock driver
3
4
  *
..
..
@@ -7,15 +8,6 @@
7
8
  * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
8
9
  * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
9
10
  * Copyright 2011 Wolfram Sang, Pengutronix e.K.
10
- */
11
-
12
-/*
13
- * The code contained herein is licensed under the GNU General Public
14
- * License. You may obtain a copy of the GNU General Public License
15
- * Version 2 or later at the following locations:
16
- *
17
- * http://www.opensource.org/licenses/gpl-license.html
18
- * http://www.gnu.org/copyleft/gpl.html
19
11
  */
20
12
 #include <linux/kernel.h>
21
13
 #include <linux/module.h>
..
..
@@ -160,15 +152,15 @@
160
152
 	if (ret)
161
153
 		return ret;
162
154
 
163
-	rtc_time_to_tm(readl(rtc_data->io + STMP3XXX_RTC_SECONDS), rtc_tm);
155
+	rtc_time64_to_tm(readl(rtc_data->io + STMP3XXX_RTC_SECONDS), rtc_tm);
164
156
 	return 0;
165
157
 }
166
158
 
167
-static int stmp3xxx_rtc_set_mmss(struct device *dev, unsigned long t)
159
+static int stmp3xxx_rtc_settime(struct device *dev, struct rtc_time *rtc_tm)
168
160
 {
169
161
 	struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
170
162
 
171
-	writel(t, rtc_data->io + STMP3XXX_RTC_SECONDS);
163
+	writel(rtc_tm_to_time64(rtc_tm), rtc_data->io + STMP3XXX_RTC_SECONDS);
172
164
 	return stmp3xxx_wait_time(rtc_data);
173
165
 }
174
166
 
..
..
@@ -214,17 +206,15 @@
214
206
 {
215
207
 	struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
216
208
 
217
-	rtc_time_to_tm(readl(rtc_data->io + STMP3XXX_RTC_ALARM), &alm->time);
209
+	rtc_time64_to_tm(readl(rtc_data->io + STMP3XXX_RTC_ALARM), &alm->time);
218
210
 	return 0;
219
211
 }
220
212
 
221
213
 static int stmp3xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
222
214
 {
223
-	unsigned long t;
224
215
 	struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev);
225
216
 
226
-	rtc_tm_to_time(&alm->time, &t);
227
-	writel(t, rtc_data->io + STMP3XXX_RTC_ALARM);
217
+	writel(rtc_tm_to_time64(&alm->time), rtc_data->io + STMP3XXX_RTC_ALARM);
228
218
 
229
219
 	stmp3xxx_alarm_irq_enable(dev, alm->enabled);
230
220
 
..
..
@@ -235,7 +225,7 @@
235
225
 	.alarm_irq_enable =
236
226
 			  stmp3xxx_alarm_irq_enable,
237
227
 	.read_time	= stmp3xxx_rtc_gettime,
238
-	.set_mmss	= stmp3xxx_rtc_set_mmss,
228
+	.set_time	= stmp3xxx_rtc_settime,
239
229
 	.read_alarm	= stmp3xxx_rtc_read_alarm,
240
230
 	.set_alarm	= stmp3xxx_rtc_set_alarm,
241
231
 };
..
..
@@ -341,7 +331,7 @@
341
331
 	default:
342
332
 		dev_warn(&pdev->dev,
343
333
 			 "invalid crystal-freq specified in device-tree. Assuming no crystal\n");
344
-		/* fall-through */
334
+		fallthrough;
345
335
 	case 0:
346
336
 		/* keep XTAL on in low-power mode */
347
337
 		pers0_set = STMP3XXX_RTC_PERSISTENT0_XTAL24MHZ_PWRUP;
..
..
@@ -361,8 +351,7 @@
361
351
 			STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
362
352
 		rtc_data->io + STMP3XXX_RTC_CTRL + STMP_OFFSET_REG_CLR);
363
353
 
364
-	rtc_data->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
365
-				&stmp3xxx_rtc_ops, THIS_MODULE);
354
+	rtc_data->rtc = devm_rtc_allocate_device(&pdev->dev);
366
355
 	if (IS_ERR(rtc_data->rtc))
367
356
 		return PTR_ERR(rtc_data->rtc);
368
357
 
..
..
@@ -373,6 +362,13 @@
373
362
 			rtc_data->irq_alarm);
374
363
 		return err;
375
364
 	}
365
+
366
+	rtc_data->rtc->ops = &stmp3xxx_rtc_ops;
367
+	rtc_data->rtc->range_max = U32_MAX;
368
+
369
+	err = rtc_register_device(rtc_data->rtc);
370
+	if (err)
371
+		return err;
376
372
 
377
373
 	stmp3xxx_wdt_register(pdev);
378
374
 	return 0;
..
..
@@ -420,5 +416,5 @@
420
416
 
421
417
 MODULE_DESCRIPTION("STMP3xxx RTC Driver");
422
418
 MODULE_AUTHOR("dmitry pervushin <dpervushin@embeddedalley.com> and "
423
-		"Wolfram Sang <w.sang@pengutronix.de>");
419
+		"Wolfram Sang <kernel@pengutronix.de>");
424
420
 MODULE_LICENSE("GPL");