Merge remote-tracking branch 'origin/master' into version/4.1

2023-11-04 07:15:11 +01:00
parent 29487e7d79 06c7567495
commit 2d653b8bd3
16 changed files with 1683 additions and 648 deletions
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -1656,9 +1656,6 @@ acpi_reset(void *priv)
            dev->regs.gpi_val |= 0x00000004;
    }

-    /* Power on always generates a resume event. */
-    dev->regs.pmsts |= 0x8100;
-
    acpi_rtc_status = 0;

    acpi_update_irq(dev);
@@ -1765,6 +1762,9 @@ acpi_init(const device_t *info)

    acpi_reset(dev);

+    /* Power on always generates a resume event. */
+    dev->regs.pmsts |= 0x8100;
+
    acpi_enabled = 1;
    return dev;
 }