Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-24 22:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

RTC fixes for 6.1

Browse Source 
Drivers:
  - cmos: fix wakeup support
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEBqsFVZXh8s/0O5JiY6TcMGxwOjIFAmNb/UAACgkQY6TcMGxw
 OjLkWw/9E/OIGSiWK0qD7AiykXAdvXu7f4OFrOae7u+EupdsvAwiY8Ej3/FPTIMB
 m6xiy95Dho5tURPihTwsWNCdiKAjIjVTuuFELRVcpKRAw0D2KnP8Vl73iy1276u3
 3PufE+r3shdb0rmxacdCZk/fI266ypMUS+Exz/EUgYYafGp2EO0TV2Do6WrThRu+
 MYSXbUmZ7BDsuQHWQzAqq37uW3koHfHfnUWoTDtbdKappaTO7GDr+58ftCEHdML1
 qwo2VSE/BtSZC740N2traih7haVL/d8z11xBa5/eYBfnhNWUWqKh6HZuDsLpoVjT
 4nhx2js/nZ3zVz5ljXuvfuVXh0B5va9y7WEbv7iAZyM7OzUU7Gt3KLVuZ3J9UQBk
 3gYkDEtHX3U0UvkFOh+Uh8wPo4mFKnCZAjXVqVi4Za5XkVGFWbCNoGJd88Bw9r51
 FzKfWGcijW5cPTkKFcsV5EPX/eKBvonW4M21hpi3kZdfVPNbjFKRSITugjHAVbwv
 nu8wCJwtvZH8I83ugkhBJHDwJZ1BzSP5JEL0Fy+TRzDLU9Qr/mQJqg2DKklD7Pad
 8OpxzQFajAzD+8xy8yHXYmpDFXBhFKwEX+2XLQtYuHhcPpjd/202mQcFktKBE2r/
 wo19rpHgioIpdxudwOsG4OenkNItJzvIR3R8EUGvH0mR5ShvVYA=
 =BtHW
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2022-10-28 13:24:57 -07:00
commit fd7e2a2586
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/rtc/rtc-cmos.c
View File

@ -1233,6 +1233,9 @@ static u32 rtc_handler(void *context)
static inline void rtc_wake_setup(struct device *dev)
{
if (acpi_disabled)
return;
acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, dev);
/*
* After the RTC handler is installed, the Fixed_RTC event should
@ -1286,7 +1289,6 @@ static void cmos_wake_setup(struct device *dev)
use_acpi_alarm_quirks();
rtc_wake_setup(dev);
acpi_rtc_info.wake_on = rtc_wake_on;
acpi_rtc_info.wake_off = rtc_wake_off;
@ -1344,6 +1346,9 @@ static void cmos_check_acpi_rtc_status(struct device *dev,
{
}
static void rtc_wake_setup(struct device *dev)
{
}
#endif
#ifdef CONFIG_PNP
@ -1354,6 +1359,8 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
{
int irq, ret;
cmos_wake_setup(&pnp->dev);
if (pnp_port_start(pnp, 0) == 0x70 && !pnp_irq_valid(pnp, 0)) {
irq = 0;
#ifdef CONFIG_X86
@ -1372,7 +1379,7 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
if (ret)
return ret;
cmos_wake_setup(&pnp->dev);
rtc_wake_setup(&pnp->dev);
return 0;
}
@ -1461,6 +1468,7 @@ static int __init cmos_platform_probe(struct platform_device *pdev)
int irq, ret;
cmos_of_init(pdev);
cmos_wake_setup(&pdev->dev);
if (RTC_IOMAPPED)
resource = platform_get_resource(pdev, IORESOURCE_IO, 0);
@ -1474,7 +1482,7 @@ static int __init cmos_platform_probe(struct platform_device *pdev)
if (ret)
return ret;
cmos_wake_setup(&pdev->dev);
rtc_wake_setup(&pdev->dev);
return 0;
}