Skip to content

Commit

Permalink
pc: acpi: move RTC device from DSDT to SSDT
Browse files Browse the repository at this point in the history
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
Igor Mammedov authored and mstsirkin committed Jan 9, 2016
1 parent 3892a2b commit ee13584
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 9 deletions.
26 changes: 26 additions & 0 deletions hw/i386/acpi-build.c
Expand Up @@ -1199,6 +1199,31 @@ static void build_hpet_aml(Aml *table)
aml_append(table, scope);
}

static Aml *build_rtc_device_aml(void)
{
Aml *dev;
Aml *crs;

dev = aml_device("RTC");
aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0B00")));
crs = aml_resource_template();
aml_append(crs, aml_io(AML_DECODE16, 0x0070, 0x0070, 0x10, 0x02));
aml_append(crs, aml_irq_no_flags(8));
aml_append(crs, aml_io(AML_DECODE16, 0x0072, 0x0072, 0x02, 0x06));
aml_append(dev, aml_name_decl("_CRS", crs));

return dev;
}

static void build_isa_devices_aml(Aml *table)
{
Aml *scope = aml_scope("_SB.PCI0.ISA");

aml_append(scope, build_rtc_device_aml());

aml_append(table, scope);
}

static void build_dbg_aml(Aml *table)
{
Aml *field;
Expand Down Expand Up @@ -1256,6 +1281,7 @@ build_ssdt(GArray *table_data, GArray *linker,

build_dbg_aml(ssdt);
build_hpet_aml(ssdt);
build_isa_devices_aml(ssdt);
build_cpu_hotplug_aml(ssdt);
build_memory_hotplug_aml(ssdt, nr_mem, pm->mem_hp_io_base,
pm->mem_hp_io_len);
Expand Down
9 changes: 0 additions & 9 deletions hw/i386/acpi-dsdt-isa.dsl
Expand Up @@ -16,15 +16,6 @@
/* Common legacy ISA style devices. */
Scope(\_SB.PCI0.ISA) {

Device(RTC) {
Name(_HID, EisaId("PNP0B00"))
Name(_CRS, ResourceTemplate() {
IO(Decode16, 0x0070, 0x0070, 0x10, 0x02)
IRQNoFlags() { 8 }
IO(Decode16, 0x0072, 0x0072, 0x02, 0x06)
})
}

Device(KBD) {
Name(_HID, EisaId("PNP0303"))
Method(_STA, 0, NotSerialized) {
Expand Down

0 comments on commit ee13584

Please sign in to comment.