From dac4497754d752130517b4576ea6b6caf4cda5d9 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Thu, 24 Oct 2019 15:13:14 +0200 Subject: [PATCH] mb/asus: Use 'Device()' instead of 'Processor()' Processor() keyword is deprecated, use Device() instead. Change-Id: I162304bdef6562fd660c01fb8fc67037ebe8cfa5 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/36304 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/asus/f2a85-m/acpi/cpstate.asl | 18 ++++++--- src/mainboard/asus/m4a78-em/acpi/cpstate.asl | 18 ++++++--- src/mainboard/asus/m4a78-em/dsdt.asl | 39 ++++++------------- src/mainboard/asus/m4a785-m/acpi/cpstate.asl | 18 ++++++--- src/mainboard/asus/m4a785-m/dsdt.asl | 39 ++++++------------- src/mainboard/asus/m4a785t-m/acpi/cpstate.asl | 18 ++++++--- src/mainboard/asus/m4a785t-m/dsdt.asl | 39 ++++++------------- src/mainboard/asus/m5a88-v/acpi/cpstate.asl | 18 ++++++--- src/mainboard/asus/m5a88-v/dsdt.asl | 39 ++++++------------- 9 files changed, 113 insertions(+), 133 deletions(-) diff --git a/src/mainboard/asus/f2a85-m/acpi/cpstate.asl b/src/mainboard/asus/f2a85-m/acpi/cpstate.asl index 69de2d86a3..3cbc0ad60b 100644 --- a/src/mainboard/asus/f2a85-m/acpi/cpstate.asl +++ b/src/mainboard/asus/f2a85-m/acpi/cpstate.asl @@ -22,17 +22,25 @@ #include DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { - Scope (\_PR) { - Processor(CPU0,0,0x808,0x06) { + Scope (\_PR) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "cpstate.asl" } - Processor(CPU1,1,0x0,0x0) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "cpstate.asl" } - Processor(CPU2,2,0x0,0x0) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "cpstate.asl" } - Processor(CPU3,3,0x0,0x0) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "cpstate.asl" } } diff --git a/src/mainboard/asus/m4a78-em/acpi/cpstate.asl b/src/mainboard/asus/m4a78-em/acpi/cpstate.asl index 206dd686f5..acaa5bae32 100644 --- a/src/mainboard/asus/m4a78-em/acpi/cpstate.asl +++ b/src/mainboard/asus/m4a78-em/acpi/cpstate.asl @@ -22,17 +22,25 @@ #include DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { - Scope (\_PR) { - Processor(CPU0,0,0x808,0x06) { + Scope (\_PR) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "cpstate.asl" } - Processor(CPU1,1,0x0,0x0) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "cpstate.asl" } - Processor(CPU2,2,0x0,0x0) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "cpstate.asl" } - Processor(CPU3,3,0x0,0x0) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "cpstate.asl" } } diff --git a/src/mainboard/asus/m4a78-em/dsdt.asl b/src/mainboard/asus/m4a78-em/dsdt.asl index 3059be9a37..eec3093b8e 100644 --- a/src/mainboard/asus/m4a78-em/dsdt.asl +++ b/src/mainboard/asus/m4a78-em/dsdt.asl @@ -58,39 +58,24 @@ DefinitionBlock ( * */ Scope (\_PR) { /* define processor scope */ - Processor( - CPU0, /* name space name */ - 0, /* Unique number for this processor */ - 0x808, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "acpi/cpstate.asl" } - - Processor( - CPU1, /* name space name */ - 1, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "acpi/cpstate.asl" } - - Processor( - CPU2, /* name space name */ - 2, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "acpi/cpstate.asl" } - - Processor( - CPU3, /* name space name */ - 3, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "acpi/cpstate.asl" } } /* End _PR scope */ diff --git a/src/mainboard/asus/m4a785-m/acpi/cpstate.asl b/src/mainboard/asus/m4a785-m/acpi/cpstate.asl index 206dd686f5..acaa5bae32 100644 --- a/src/mainboard/asus/m4a785-m/acpi/cpstate.asl +++ b/src/mainboard/asus/m4a785-m/acpi/cpstate.asl @@ -22,17 +22,25 @@ #include DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { - Scope (\_PR) { - Processor(CPU0,0,0x808,0x06) { + Scope (\_PR) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "cpstate.asl" } - Processor(CPU1,1,0x0,0x0) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "cpstate.asl" } - Processor(CPU2,2,0x0,0x0) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "cpstate.asl" } - Processor(CPU3,3,0x0,0x0) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "cpstate.asl" } } diff --git a/src/mainboard/asus/m4a785-m/dsdt.asl b/src/mainboard/asus/m4a785-m/dsdt.asl index 3059be9a37..eec3093b8e 100644 --- a/src/mainboard/asus/m4a785-m/dsdt.asl +++ b/src/mainboard/asus/m4a785-m/dsdt.asl @@ -58,39 +58,24 @@ DefinitionBlock ( * */ Scope (\_PR) { /* define processor scope */ - Processor( - CPU0, /* name space name */ - 0, /* Unique number for this processor */ - 0x808, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "acpi/cpstate.asl" } - - Processor( - CPU1, /* name space name */ - 1, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "acpi/cpstate.asl" } - - Processor( - CPU2, /* name space name */ - 2, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "acpi/cpstate.asl" } - - Processor( - CPU3, /* name space name */ - 3, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "acpi/cpstate.asl" } } /* End _PR scope */ diff --git a/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl b/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl index f8cfda2424..e9a93c0466 100644 --- a/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl +++ b/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl @@ -22,17 +22,25 @@ #include DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { - Scope (\_PR) { - Processor(CPU0,0,0x808,0x06) { + Scope (\_PR) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "cpstate.asl" } - Processor(CPU1,1,0x0,0x0) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "cpstate.asl" } - Processor(CPU2,2,0x0,0x0) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "cpstate.asl" } - Processor(CPU3,3,0x0,0x0) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "cpstate.asl" } } diff --git a/src/mainboard/asus/m4a785t-m/dsdt.asl b/src/mainboard/asus/m4a785t-m/dsdt.asl index debbb8cffd..20d74d0426 100644 --- a/src/mainboard/asus/m4a785t-m/dsdt.asl +++ b/src/mainboard/asus/m4a785t-m/dsdt.asl @@ -58,39 +58,24 @@ DefinitionBlock ( * */ Scope (\_PR) { /* define processor scope */ - Processor( - CPU0, /* name space name */ - 0, /* Unique number for this processor */ - 0x808, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "acpi/cpstate.asl" } - - Processor( - CPU1, /* name space name */ - 1, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "acpi/cpstate.asl" } - - Processor( - CPU2, /* name space name */ - 2, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "acpi/cpstate.asl" } - - Processor( - CPU3, /* name space name */ - 3, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "acpi/cpstate.asl" } } /* End _PR scope */ diff --git a/src/mainboard/asus/m5a88-v/acpi/cpstate.asl b/src/mainboard/asus/m5a88-v/acpi/cpstate.asl index 5d71c8164f..eb4eac1027 100644 --- a/src/mainboard/asus/m5a88-v/acpi/cpstate.asl +++ b/src/mainboard/asus/m5a88-v/acpi/cpstate.asl @@ -22,17 +22,25 @@ #include DefinitionBlock ("DSDT.AML", "DSDT", 0x01, OEM_ID, ACPI_TABLE_CREATOR, 0x00010001) { - Scope (\_PR) { - Processor(CPU0,0,0x808,0x06) { + Scope (\_PR) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "cpstate.asl" } - Processor(CPU1,1,0x0,0x0) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "cpstate.asl" } - Processor(CPU2,2,0x0,0x0) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "cpstate.asl" } - Processor(CPU3,3,0x0,0x0) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "cpstate.asl" } } diff --git a/src/mainboard/asus/m5a88-v/dsdt.asl b/src/mainboard/asus/m5a88-v/dsdt.asl index 0b5f25af56..3d2a781a9a 100644 --- a/src/mainboard/asus/m5a88-v/dsdt.asl +++ b/src/mainboard/asus/m5a88-v/dsdt.asl @@ -58,39 +58,24 @@ DefinitionBlock ( * */ Scope (\_PR) { /* define processor scope */ - Processor( - CPU0, /* name space name */ - 0, /* Unique number for this processor */ - 0x808, /* PBLK system I/O address !hardcoded! */ - 0x06 /* PBLKLEN for boot processor */ - ) { + Device (CPU0) { + Name (_HID, "ACPI0007") + Name (_UID, 0) #include "acpi/cpstate.asl" } - - Processor( - CPU1, /* name space name */ - 1, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU1) { + Name (_HID, "ACPI0007") + Name (_UID, 1) #include "acpi/cpstate.asl" } - - Processor( - CPU2, /* name space name */ - 2, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU2) { + Name (_HID, "ACPI0007") + Name (_UID, 2) #include "acpi/cpstate.asl" } - - Processor( - CPU3, /* name space name */ - 3, /* Unique number for this processor */ - 0x0000, /* PBLK system I/O address !hardcoded! */ - 0x00 /* PBLKLEN for boot processor */ - ) { + Device (CPU3) { + Name (_HID, "ACPI0007") + Name (_UID, 3) #include "acpi/cpstate.asl" } } /* End _PR scope */