Skip to content

Commit 2a9f04b

Browse files
committed
Merge tag 'rtc-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC updates from Alexandre Belloni: "Not much this cycle, there are multiple small fixes. Core: - use boolean values with device_init_wakeup() Drivers: - pcf2127: add BSM support - pcf85063: fix possible out of bounds write" * tag 'rtc-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: pcf2127: add BSM support rtc: Remove hpet_rtc_dropped_irq() dt-bindings: rtc: mxc: Document fsl,imx31-rtc rtc: stm32: Use syscon_regmap_lookup_by_phandle_args rtc: zynqmp: Fix optional clock name property rtc: loongson: clear TOY_MATCH0_REG in loongson_rtc_isr() rtc: pcf85063: fix potential OOB write in PCF85063 NVMEM read rtc: tps6594: Fix integer overflow on 32bit systems rtc: use boolean values with device_init_wakeup() rtc: RTC_DRV_SPEAR should not default to y when compile-testing
2 parents a4b5e48 + 9727452 commit 2a9f04b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+180
-102
lines changed

Documentation/devicetree/bindings/rtc/rtc-mxc.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ maintainers:
1414

1515
properties:
1616
compatible:
17-
enum:
18-
- fsl,imx1-rtc
19-
- fsl,imx21-rtc
17+
oneOf:
18+
- const: fsl,imx1-rtc
19+
- const: fsl,imx21-rtc
20+
- items:
21+
- enum:
22+
- fsl,imx31-rtc
23+
- const: fsl,imx21-rtc
2024

2125
reg:
2226
maxItems: 1

arch/x86/include/asm/hpet.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ extern int hpet_set_rtc_irq_bit(unsigned long bit_mask);
8484
extern int hpet_set_alarm_time(unsigned char hrs, unsigned char min,
8585
unsigned char sec);
8686
extern int hpet_set_periodic_freq(unsigned long freq);
87-
extern int hpet_rtc_dropped_irq(void);
8887
extern int hpet_rtc_timer_init(void);
8988
extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
9089
extern int hpet_register_irq_handler(rtc_irq_handler handler);

arch/x86/kernel/hpet.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,12 +1382,6 @@ int hpet_set_periodic_freq(unsigned long freq)
13821382
}
13831383
EXPORT_SYMBOL_GPL(hpet_set_periodic_freq);
13841384

1385-
int hpet_rtc_dropped_irq(void)
1386-
{
1387-
return is_hpet_enabled();
1388-
}
1389-
EXPORT_SYMBOL_GPL(hpet_rtc_dropped_irq);
1390-
13911385
static void hpet_rtc_timer_reinit(void)
13921386
{
13931387
unsigned int delta;

drivers/rtc/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1316,7 +1316,7 @@ config RTC_DRV_SC27XX
13161316
config RTC_DRV_SPEAR
13171317
tristate "SPEAR ST RTC"
13181318
depends on PLAT_SPEAR || COMPILE_TEST
1319-
default y
1319+
default PLAT_SPEAR
13201320
help
13211321
If you say Y here you will get support for the RTC found on
13221322
spear

drivers/rtc/rtc-88pm80x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ static int pm80x_rtc_probe(struct platform_device *pdev)
308308
/* remember whether this power up is caused by PMIC RTC or not */
309309
info->rtc_dev->dev.platform_data = &pdata->rtc_wakeup;
310310

311-
device_init_wakeup(&pdev->dev, 1);
311+
device_init_wakeup(&pdev->dev, true);
312312

313313
return 0;
314314
out_rtc:

drivers/rtc/rtc-88pm860x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ static int pm860x_rtc_probe(struct platform_device *pdev)
326326
schedule_delayed_work(&info->calib_work, VRTC_CALIB_INTERVAL);
327327
#endif /* VRTC_CALIBRATION */
328328

329-
device_init_wakeup(&pdev->dev, 1);
329+
device_init_wakeup(&pdev->dev, true);
330330

331331
return 0;
332332
}

drivers/rtc/rtc-amlogic-a4.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ static int aml_rtc_probe(struct platform_device *pdev)
361361
"failed to get_enable rtc sys clk\n");
362362
aml_rtc_init(rtc);
363363

364-
device_init_wakeup(dev, 1);
364+
device_init_wakeup(dev, true);
365365
platform_set_drvdata(pdev, rtc);
366366

367367
rtc->rtc_dev = devm_rtc_allocate_device(dev);
@@ -391,7 +391,7 @@ static int aml_rtc_probe(struct platform_device *pdev)
391391
return 0;
392392
err_clk:
393393
clk_disable_unprepare(rtc->sys_clk);
394-
device_init_wakeup(dev, 0);
394+
device_init_wakeup(dev, false);
395395

396396
return ret;
397397
}
@@ -426,7 +426,7 @@ static void aml_rtc_remove(struct platform_device *pdev)
426426
struct aml_rtc_data *rtc = dev_get_drvdata(&pdev->dev);
427427

428428
clk_disable_unprepare(rtc->sys_clk);
429-
device_init_wakeup(&pdev->dev, 0);
429+
device_init_wakeup(&pdev->dev, false);
430430
}
431431

432432
static const struct aml_rtc_config a5_rtc_config = {

drivers/rtc/rtc-armada38x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)
527527
platform_set_drvdata(pdev, rtc);
528528

529529
if (rtc->irq != -1)
530-
device_init_wakeup(&pdev->dev, 1);
530+
device_init_wakeup(&pdev->dev, true);
531531
else
532532
clear_bit(RTC_FEATURE_ALARM, rtc->rtc_dev->features);
533533

drivers/rtc/rtc-as3722.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ static int as3722_rtc_probe(struct platform_device *pdev)
187187
return ret;
188188
}
189189

190-
device_init_wakeup(&pdev->dev, 1);
190+
device_init_wakeup(&pdev->dev, true);
191191

192192
as3722_rtc->rtc = devm_rtc_device_register(&pdev->dev, "as3722-rtc",
193193
&as3722_rtc_ops, THIS_MODULE);

drivers/rtc/rtc-at91rm9200.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
528528
* being wake-capable; if it didn't, do that here.
529529
*/
530530
if (!device_can_wakeup(&pdev->dev))
531-
device_init_wakeup(&pdev->dev, 1);
531+
device_init_wakeup(&pdev->dev, true);
532532

533533
if (at91_rtc_config->has_correction)
534534
rtc->ops = &sama5d4_rtc_ops;

0 commit comments

Comments
 (0)