Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'rtc-6.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fixes from Alexandre Belloni:
"Fix wakeup support that broke on multiple platforms"
* tag 'rtc-6.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
rtc: cmos: fix build on non-ACPI platforms
rtc: cmos: Fix wake alarm breakage
+11
-3
+11
-3
drivers/rtc/rtc-cmos.c
+11
-3
drivers/rtc/rtc-cmos.c
···
1233
1233
1234
1234
static inline void rtc_wake_setup(struct device *dev)
1235
1235
{
1236
+
if (acpi_disabled)
1237
+
return;
1238
+
1236
1239
acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, dev);
1237
1240
/*
1238
1241
* After the RTC handler is installed, the Fixed_RTC event should
···
1289
1286
1290
1287
use_acpi_alarm_quirks();
1291
1288
1292
-
rtc_wake_setup(dev);
1293
1289
acpi_rtc_info.wake_on = rtc_wake_on;
1294
1290
acpi_rtc_info.wake_off = rtc_wake_off;
1295
1291
···
1346
1344
{
1347
1345
}
1348
1346
1347
+
static void rtc_wake_setup(struct device *dev)
1348
+
{
1349
+
}
1349
1350
#endif
1350
1351
1351
1352
#ifdef CONFIG_PNP
···
1358
1353
static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
1359
1354
{
1360
1355
int irq, ret;
1356
+
1357
+
cmos_wake_setup(&pnp->dev);
1361
1358
1362
1359
if (pnp_port_start(pnp, 0) == 0x70 && !pnp_irq_valid(pnp, 0)) {
1363
1360
irq = 0;
···
1379
1372
if (ret)
1380
1373
return ret;
1381
1374
1382
-
cmos_wake_setup(&pnp->dev);
1375
+
rtc_wake_setup(&pnp->dev);
1383
1376
1384
1377
return 0;
1385
1378
}
···
1468
1461
int irq, ret;
1469
1462
1470
1463
cmos_of_init(pdev);
1464
+
cmos_wake_setup(&pdev->dev);
1471
1465
1472
1466
if (RTC_IOMAPPED)
1473
1467
resource = platform_get_resource(pdev, IORESOURCE_IO, 0);
···
1482
1474
if (ret)
1483
1475
return ret;
1484
1476
1485
-
cmos_wake_setup(&pdev->dev);
1477
+
rtc_wake_setup(&pdev->dev);
1486
1478
1487
1479
return 0;
1488
1480
}