From 3f2467032e3e40cd456d2d9fe5120a60283784aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 25 Jan 2021 16:48:51 +0200 Subject: sb,soc/amd: Rename PMOD to PICM in ASL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the same variable name as soc/intel to implement a common _PIC method at top-level ASL. Change-Id: I48f9e224d6d0101c2101be99cd18ff382738f0dd Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/49903 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/mainboard/amd/gardenia/acpi/mainboard.asl | 2 +- src/mainboard/amd/inagua/acpi/mainboard.asl | 2 +- src/mainboard/amd/olivehill/acpi/mainboard.asl | 2 +- src/mainboard/amd/padmelon/acpi/mainboard.asl | 2 +- src/mainboard/amd/parmer/acpi/mainboard.asl | 2 +- src/mainboard/amd/persimmon/acpi/mainboard.asl | 2 +- src/mainboard/amd/south_station/acpi/mainboard.asl | 2 +- src/mainboard/amd/thatcher/acpi/mainboard.asl | 2 +- src/mainboard/amd/union_station/acpi/mainboard.asl | 2 +- src/mainboard/asrock/e350m1/acpi/mainboard.asl | 2 +- src/mainboard/asrock/imb-a180/acpi/mainboard.asl | 2 +- src/mainboard/asus/a88xm-e/acpi/mainboard.asl | 2 +- src/mainboard/asus/am1i-a/acpi/mainboard.asl | 2 +- src/mainboard/asus/f2a85-m/acpi/mainboard.asl | 2 +- src/mainboard/asus/f2a85-m/dsdt.asl | 4 ++-- src/mainboard/bap/ode_e20XX/acpi/mainboard.asl | 2 +- src/mainboard/biostar/a68n_5200/acpi/mainboard.asl | 2 +- src/mainboard/biostar/am1ml/acpi/mainboard.asl | 2 +- src/mainboard/elmex/pcm205400/acpi/mainboard.asl | 2 +- src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl | 2 +- .../gizmosphere/gizmo2/acpi/mainboard.asl | 2 +- .../baseboard/include/baseboard/acpi/mainboard.asl | 2 +- src/mainboard/hp/abm/acpi/mainboard.asl | 2 +- .../hp/pavilion_m6_1035dx/acpi/mainboard.asl | 2 +- .../jetway/nf81-t56n-lf/acpi/mainboard.asl | 2 +- src/mainboard/lenovo/g505s/acpi/mainboard.asl | 2 +- src/mainboard/lippert/frontrunner-af/dsdt.asl | 28 +++++++++++----------- src/mainboard/msi/ms7721/acpi/mainboard.asl | 2 +- src/mainboard/pcengines/apu1/acpi/mainboard.asl | 2 +- src/mainboard/pcengines/apu2/acpi/mainboard.asl | 2 +- .../amd/agesa/family14/acpi/northbridge.asl | 20 ++++++++-------- .../amd/agesa/family15tn/acpi/northbridge.asl | 12 +++++----- .../amd/agesa/family16kb/acpi/northbridge.asl | 12 +++++----- .../amd/pi/00630F01/acpi/northbridge.asl | 6 ++--- .../amd/pi/00730F01/acpi/northbridge.asl | 12 +++++----- src/soc/amd/picasso/acpi/globalnvs.asl | 2 +- src/soc/amd/picasso/acpi/pci_int.asl | 12 +++++----- src/soc/amd/picasso/acpi/sb_fch.asl | 16 ++++++------- src/soc/amd/stoneyridge/acpi/northbridge.asl | 12 +++++----- src/soc/amd/stoneyridge/acpi/pci_int.asl | 2 +- src/southbridge/amd/agesa/hudson/acpi/pci_int.asl | 2 +- src/southbridge/amd/cimx/sb800/acpi/fch.asl | 2 +- src/southbridge/amd/cimx/sb800/acpi/pcie.asl | 2 +- src/southbridge/amd/pi/hudson/acpi/pci_int.asl | 2 +- 44 files changed, 101 insertions(+), 101 deletions(-) (limited to 'src') diff --git a/src/mainboard/amd/gardenia/acpi/mainboard.asl b/src/mainboard/amd/gardenia/acpi/mainboard.asl index d59240bc16..91d3353ad2 100644 --- a/src/mainboard/amd/gardenia/acpi/mainboard.asl +++ b/src/mainboard/amd/gardenia/acpi/mainboard.asl @@ -12,4 +12,4 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ diff --git a/src/mainboard/amd/inagua/acpi/mainboard.asl b/src/mainboard/amd/inagua/acpi/mainboard.asl index 9283191c95..e4a0c799fe 100644 --- a/src/mainboard/amd/inagua/acpi/mainboard.asl +++ b/src/mainboard/amd/inagua/acpi/mainboard.asl @@ -13,7 +13,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ Scope(\_SB) { Method(OSFL, 0){ diff --git a/src/mainboard/amd/olivehill/acpi/mainboard.asl b/src/mainboard/amd/olivehill/acpi/mainboard.asl index 63c7356120..074be8d0f4 100644 --- a/src/mainboard/amd/olivehill/acpi/mainboard.asl +++ b/src/mainboard/amd/olivehill/acpi/mainboard.asl @@ -12,7 +12,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/mainboard/amd/padmelon/acpi/mainboard.asl b/src/mainboard/amd/padmelon/acpi/mainboard.asl index d59240bc16..91d3353ad2 100644 --- a/src/mainboard/amd/padmelon/acpi/mainboard.asl +++ b/src/mainboard/amd/padmelon/acpi/mainboard.asl @@ -12,4 +12,4 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ diff --git a/src/mainboard/amd/parmer/acpi/mainboard.asl b/src/mainboard/amd/parmer/acpi/mainboard.asl index cb896fa8ae..61b8ef6d51 100644 --- a/src/mainboard/amd/parmer/acpi/mainboard.asl +++ b/src/mainboard/amd/parmer/acpi/mainboard.asl @@ -14,7 +14,7 @@ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ - Name(PMOD, One) /* Assume APIC */ + Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/mainboard/amd/persimmon/acpi/mainboard.asl b/src/mainboard/amd/persimmon/acpi/mainboard.asl index 9283191c95..e4a0c799fe 100644 --- a/src/mainboard/amd/persimmon/acpi/mainboard.asl +++ b/src/mainboard/amd/persimmon/acpi/mainboard.asl @@ -13,7 +13,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ Scope(\_SB) { Method(OSFL, 0){ diff --git a/src/mainboard/amd/south_station/acpi/mainboard.asl b/src/mainboard/amd/south_station/acpi/mainboard.asl index 9283191c95..e4a0c799fe 100644 --- a/src/mainboard/amd/south_station/acpi/mainboard.asl +++ b/src/mainboard/amd/south_station/acpi/mainboard.asl @@ -13,7 +13,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ Scope(\_SB) { Method(OSFL, 0){ diff --git a/src/mainboard/amd/thatcher/acpi/mainboard.asl b/src/mainboard/amd/thatcher/acpi/mainboard.asl index cb896fa8ae..61b8ef6d51 100644 --- a/src/mainboard/amd/thatcher/acpi/mainboard.asl +++ b/src/mainboard/amd/thatcher/acpi/mainboard.asl @@ -14,7 +14,7 @@ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ - Name(PMOD, One) /* Assume APIC */ + Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/mainboard/amd/union_station/acpi/mainboard.asl b/src/mainboard/amd/union_station/acpi/mainboard.asl index 9283191c95..e4a0c799fe 100644 --- a/src/mainboard/amd/union_station/acpi/mainboard.asl +++ b/src/mainboard/amd/union_station/acpi/mainboard.asl @@ -13,7 +13,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ Scope(\_SB) { Method(OSFL, 0){ diff --git a/src/mainboard/asrock/e350m1/acpi/mainboard.asl b/src/mainboard/asrock/e350m1/acpi/mainboard.asl index 9283191c95..e4a0c799fe 100644 --- a/src/mainboard/asrock/e350m1/acpi/mainboard.asl +++ b/src/mainboard/asrock/e350m1/acpi/mainboard.asl @@ -13,7 +13,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ Scope(\_SB) { Method(OSFL, 0){ diff --git a/src/mainboard/asrock/imb-a180/acpi/mainboard.asl b/src/mainboard/asrock/imb-a180/acpi/mainboard.asl index 63c7356120..074be8d0f4 100644 --- a/src/mainboard/asrock/imb-a180/acpi/mainboard.asl +++ b/src/mainboard/asrock/imb-a180/acpi/mainboard.asl @@ -12,7 +12,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/mainboard/asus/a88xm-e/acpi/mainboard.asl b/src/mainboard/asus/a88xm-e/acpi/mainboard.asl index 699bc6b031..2653b0af22 100644 --- a/src/mainboard/asus/a88xm-e/acpi/mainboard.asl +++ b/src/mainboard/asus/a88xm-e/acpi/mainboard.asl @@ -17,4 +17,4 @@ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ - Name(PMOD, One) /* Assume APIC */ + Name(PICM, One) /* Assume APIC */ diff --git a/src/mainboard/asus/am1i-a/acpi/mainboard.asl b/src/mainboard/asus/am1i-a/acpi/mainboard.asl index 63c7356120..074be8d0f4 100644 --- a/src/mainboard/asus/am1i-a/acpi/mainboard.asl +++ b/src/mainboard/asus/am1i-a/acpi/mainboard.asl @@ -12,7 +12,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl index e7928870f5..42db31d000 100644 --- a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl +++ b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl @@ -14,4 +14,4 @@ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ - Name(PMOD, One) /* Assume APIC */ + Name(PICM, One) /* Assume APIC */ diff --git a/src/mainboard/asus/f2a85-m/dsdt.asl b/src/mainboard/asus/f2a85-m/dsdt.asl index 3f72eb105e..7b52fb6cbe 100644 --- a/src/mainboard/asus/f2a85-m/dsdt.asl +++ b/src/mainboard/asus/f2a85-m/dsdt.asl @@ -52,7 +52,7 @@ DefinitionBlock ( Name(_ADR, 0x00150000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(ABR0) } /* APIC mode */ + If(PICM){ Return(ABR0) } /* APIC mode */ Return (PBR0) /* PIC mode */ } } @@ -61,7 +61,7 @@ DefinitionBlock ( Name(_ADR, 0x00150001) Name(_PRW, Package() {0x18, 4}) Method(_PRT, 0) { - If(PMOD){ Return(ABR1) } /* APIC mode */ + If(PICM){ Return(ABR1) } /* APIC mode */ Return (PBR1) /* PIC mode */ } } diff --git a/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl b/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl index 63c7356120..074be8d0f4 100644 --- a/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl +++ b/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl @@ -12,7 +12,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl b/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl index 63c7356120..074be8d0f4 100644 --- a/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl +++ b/src/mainboard/biostar/a68n_5200/acpi/mainboard.asl @@ -12,7 +12,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/mainboard/biostar/am1ml/acpi/mainboard.asl b/src/mainboard/biostar/am1ml/acpi/mainboard.asl index 63c7356120..074be8d0f4 100644 --- a/src/mainboard/biostar/am1ml/acpi/mainboard.asl +++ b/src/mainboard/biostar/am1ml/acpi/mainboard.asl @@ -12,7 +12,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/mainboard/elmex/pcm205400/acpi/mainboard.asl b/src/mainboard/elmex/pcm205400/acpi/mainboard.asl index 9283191c95..e4a0c799fe 100644 --- a/src/mainboard/elmex/pcm205400/acpi/mainboard.asl +++ b/src/mainboard/elmex/pcm205400/acpi/mainboard.asl @@ -13,7 +13,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ Scope(\_SB) { Method(OSFL, 0){ diff --git a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl index 9283191c95..e4a0c799fe 100644 --- a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl +++ b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl @@ -13,7 +13,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ Scope(\_SB) { Method(OSFL, 0){ diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl index 63c7356120..074be8d0f4 100644 --- a/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl +++ b/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl @@ -12,7 +12,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl index ddfd4cbb2f..3b163ac762 100644 --- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl +++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/mainboard.asl @@ -17,4 +17,4 @@ Name (HPBA, 0xFED00000) /* Global Data */ Name (OSVR, 3) /* WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name (OSV, Ones) /* Assume nothing */ -Name (PMOD, One) /* Assume APIC */ +Name (PICM, One) /* Assume APIC */ diff --git a/src/mainboard/hp/abm/acpi/mainboard.asl b/src/mainboard/hp/abm/acpi/mainboard.asl index 390efacfda..a2cf121c2d 100644 --- a/src/mainboard/hp/abm/acpi/mainboard.asl +++ b/src/mainboard/hp/abm/acpi/mainboard.asl @@ -12,7 +12,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl index dd3318e3cc..3aa7a02b9b 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl +++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl @@ -14,7 +14,7 @@ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ - Name(PMOD, One) /* Assume APIC */ + Name(PICM, One) /* Assume APIC */ /* Variables used by EC */ /* TODO: These may belong in global non-volatile storage */ diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl index 9283191c95..e4a0c799fe 100644 --- a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl +++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl @@ -13,7 +13,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ Scope(\_SB) { Method(OSFL, 0){ diff --git a/src/mainboard/lenovo/g505s/acpi/mainboard.asl b/src/mainboard/lenovo/g505s/acpi/mainboard.asl index be686309ca..698686466f 100644 --- a/src/mainboard/lenovo/g505s/acpi/mainboard.asl +++ b/src/mainboard/lenovo/g505s/acpi/mainboard.asl @@ -14,7 +14,7 @@ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ - Name(PMOD, One) /* Assume APIC */ + Name(PICM, One) /* Assume APIC */ /* Variables used by EC */ /* TODO: These may belong in global non-volatile storage */ diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl index 5b5fa2b048..3dbbcb7364 100644 --- a/src/mainboard/lippert/frontrunner-af/dsdt.asl +++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl @@ -37,7 +37,7 @@ DefinitionBlock ( /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ - Name(PMOD, One) /* Assume APIC */ + Name(PICM, One) /* Assume APIC */ /* * Processor Object @@ -394,7 +394,7 @@ DefinitionBlock ( { \_SB.CIRQ() } - PMOD = Arg0 + PICM = Arg0 } Method(CIRQ, 0x00, NotSerialized){ PIRA = 0 @@ -883,7 +883,7 @@ DefinitionBlock ( } Method(_PRT,0) { - If(PMOD){ Return(APR0) } /* APIC mode */ + If(PICM){ Return(APR0) } /* APIC mode */ Return (PR0) /* PIC Mode */ } /* end _PRT */ @@ -906,7 +906,7 @@ DefinitionBlock ( Name(_ADR, 0x00020000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APS2) } /* APIC mode */ + If(PICM){ Return(APS2) } /* APIC mode */ Return (PS2) /* PIC Mode */ } /* end _PRT */ } /* end PBR2 */ @@ -917,7 +917,7 @@ DefinitionBlock ( Name(_ADR, 0x00040000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APS4) } /* APIC mode */ + If(PICM){ Return(APS4) } /* APIC mode */ Return (PS4) /* PIC Mode */ } /* end _PRT */ } /* end PBR4 */ @@ -926,7 +926,7 @@ DefinitionBlock ( Name(_ADR, 0x00050000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APS5) } /* APIC mode */ + If(PICM){ Return(APS5) } /* APIC mode */ Return (PS5) /* PIC Mode */ } /* end _PRT */ } /* end PBR5 */ @@ -935,7 +935,7 @@ DefinitionBlock ( Name(_ADR, 0x00060000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APS6) } /* APIC mode */ + If(PICM){ Return(APS6) } /* APIC mode */ Return (PS6) /* PIC Mode */ } /* end _PRT */ } /* end PBR6 */ @@ -945,7 +945,7 @@ DefinitionBlock ( Name(_ADR, 0x00070000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APS7) } /* APIC mode */ + If(PICM){ Return(APS7) } /* APIC mode */ Return (PS7) /* PIC Mode */ } /* end _PRT */ } /* end PBR7 */ @@ -955,7 +955,7 @@ DefinitionBlock ( Name(_ADR, 0x00090000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APS9) } /* APIC mode */ + If(PICM){ Return(APS9) } /* APIC mode */ Return (PS9) /* PIC Mode */ } /* end _PRT */ } /* end PBR9 */ @@ -964,7 +964,7 @@ DefinitionBlock ( Name(_ADR, 0x000A0000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APSa) } /* APIC mode */ + If(PICM){ Return(APSa) } /* APIC mode */ Return (PSa) /* PIC Mode */ } /* end _PRT */ } /* end PBRa */ @@ -973,7 +973,7 @@ DefinitionBlock ( Name(_ADR, 0x00150000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APE0) } /* APIC mode */ + If(PICM){ Return(APE0) } /* APIC mode */ Return (PE0) /* PIC Mode */ } /* end _PRT */ } /* end PE20 */ @@ -981,7 +981,7 @@ DefinitionBlock ( Name(_ADR, 0x00150001) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APE1) } /* APIC mode */ + If(PICM){ Return(APE1) } /* APIC mode */ Return (PE1) /* PIC Mode */ } /* end _PRT */ } /* end PE21 */ @@ -989,7 +989,7 @@ DefinitionBlock ( Name(_ADR, 0x00150002) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APE2) } /* APIC mode */ + If(PICM){ Return(APE2) } /* APIC mode */ Return (APE2) /* PIC Mode */ } /* end _PRT */ } /* end PE22 */ @@ -997,7 +997,7 @@ DefinitionBlock ( Name(_ADR, 0x00150003) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD){ Return(APE3) } /* APIC mode */ + If(PICM){ Return(APE3) } /* APIC mode */ Return (PE3) /* PIC Mode */ } /* end _PRT */ } /* end PE23 */ diff --git a/src/mainboard/msi/ms7721/acpi/mainboard.asl b/src/mainboard/msi/ms7721/acpi/mainboard.asl index e7928870f5..42db31d000 100644 --- a/src/mainboard/msi/ms7721/acpi/mainboard.asl +++ b/src/mainboard/msi/ms7721/acpi/mainboard.asl @@ -14,4 +14,4 @@ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ - Name(PMOD, One) /* Assume APIC */ + Name(PICM, One) /* Assume APIC */ diff --git a/src/mainboard/pcengines/apu1/acpi/mainboard.asl b/src/mainboard/pcengines/apu1/acpi/mainboard.asl index 5c0929a3f1..a1eb03b469 100644 --- a/src/mainboard/pcengines/apu1/acpi/mainboard.asl +++ b/src/mainboard/pcengines/apu1/acpi/mainboard.asl @@ -13,7 +13,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ Scope(\_SB) { Method(OSFL, 0){ diff --git a/src/mainboard/pcengines/apu2/acpi/mainboard.asl b/src/mainboard/pcengines/apu2/acpi/mainboard.asl index 63c7356120..074be8d0f4 100644 --- a/src/mainboard/pcengines/apu2/acpi/mainboard.asl +++ b/src/mainboard/pcengines/apu2/acpi/mainboard.asl @@ -12,7 +12,7 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */ /* Some global data */ Name(OSVR, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */ Name(OSV, Ones) /* Assume nothing */ -Name(PMOD, One) /* Assume APIC */ +Name(PICM, One) /* Assume APIC */ /* AcpiGpe0Blk */ OperationRegion(GP0B, SystemMemory, 0xfed80814, 0x04) diff --git a/src/northbridge/amd/agesa/family14/acpi/northbridge.asl b/src/northbridge/amd/agesa/family14/acpi/northbridge.asl index 21d2ffed67..b2b591325e 100644 --- a/src/northbridge/amd/agesa/family14/acpi/northbridge.asl +++ b/src/northbridge/amd/agesa/family14/acpi/northbridge.asl @@ -16,7 +16,7 @@ Device(AGPB) { Name(_ADR, 0x00010000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APR1) } /* APIC mode */ + If(PICM) { Return(APR1) } /* APIC mode */ Return (PR1) /* PIC Mode */ } } /* end AGPB */ @@ -26,7 +26,7 @@ Device(HDMI) { Name(_ADR, 0x00010001) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APR1) } /* APIC mode */ + If(PICM) { Return(APR1) } /* APIC mode */ Return (PR1) /* PIC Mode */ } } /* end HDMI */ @@ -38,7 +38,7 @@ Device(PBR4) { Name(_ADR, 0x00040000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS4) } /* APIC mode */ + If(PICM) { Return(APS4) } /* APIC mode */ Return (PS4) /* PIC Mode */ } /* end _PRT */ } /* end PBR4 */ @@ -48,7 +48,7 @@ Device(PBR5) { Name(_ADR, 0x00050000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS5) } /* APIC mode */ + If(PICM) { Return(APS5) } /* APIC mode */ Return (PS5) /* PIC Mode */ } /* end _PRT */ } /* end PBR5 */ @@ -58,7 +58,7 @@ Device(PBR6) { Name(_ADR, 0x00060000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS6) } /* APIC mode */ + If(PICM) { Return(APS6) } /* APIC mode */ Return (PS6) /* PIC Mode */ } /* end _PRT */ } /* end PBR6 */ @@ -68,7 +68,7 @@ Device(PBR7) { Name(_ADR, 0x00070000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS7) } /* APIC mode */ + If(PICM) { Return(APS7) } /* APIC mode */ Return (PS7) /* PIC Mode */ } /* end _PRT */ } /* end PBR7 */ @@ -77,7 +77,7 @@ Device(PE20) { Name(_ADR, 0x00150000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APE0) } /* APIC mode */ + If(PICM) { Return(APE0) } /* APIC mode */ Return (PE0) /* PIC Mode */ } /* end _PRT */ } /* end PE20 */ @@ -86,7 +86,7 @@ Device(PE21) { Name(_ADR, 0x00150001) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APE1) } /* APIC mode */ + If(PICM) { Return(APE1) } /* APIC mode */ Return (PE1) /* PIC Mode */ } /* end _PRT */ } /* end PE21 */ @@ -95,7 +95,7 @@ Device(PE22) { Name(_ADR, 0x00150002) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APE2) } /* APIC mode */ + If(PICM) { Return(APE2) } /* APIC mode */ Return (APE2) /* PIC Mode */ } /* end _PRT */ } /* end PE22 */ @@ -104,7 +104,7 @@ Device(PE23) { Name(_ADR, 0x00150003) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APE3) } /* APIC mode */ + If(PICM) { Return(APE3) } /* APIC mode */ Return (PE3) /* PIC Mode */ } /* end _PRT */ } /* end PE23 */ diff --git a/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl b/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl index d77d0dc1c5..849506ef0e 100644 --- a/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl +++ b/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl @@ -19,7 +19,7 @@ Method (_STA, 0, NotSerialized) Method (_PRT, 0, NotSerialized) { - If (PMOD) + If (PICM) { Return (APR0) } @@ -36,7 +36,7 @@ Device(PBR2) { Name(_ADR, 0x00020000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS2) } /* APIC mode */ + If(PICM) { Return(APS2) } /* APIC mode */ Return (PS2) /* PIC Mode */ } /* end _PRT */ } /* end PBR2 */ @@ -46,7 +46,7 @@ Device(PBR4) { Name(_ADR, 0x00040000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS4) } /* APIC mode */ + If(PICM) { Return(APS4) } /* APIC mode */ Return (PS4) /* PIC Mode */ } /* end _PRT */ } /* end PBR4 */ @@ -56,7 +56,7 @@ Device(PBR5) { Name(_ADR, 0x00050000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS5) } /* APIC mode */ + If(PICM) { Return(APS5) } /* APIC mode */ Return (PS5) /* PIC Mode */ } /* end _PRT */ } /* end PBR5 */ @@ -66,7 +66,7 @@ Device(PBR6) { Name(_ADR, 0x00060000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS6) } /* APIC mode */ + If(PICM) { Return(APS6) } /* APIC mode */ Return (PS6) /* PIC Mode */ } /* end _PRT */ } /* end PBR6 */ @@ -76,7 +76,7 @@ Device(PBR7) { Name(_ADR, 0x00070000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS7) } /* APIC mode */ + If(PICM) { Return(APS7) } /* APIC mode */ Return (PS7) /* PIC Mode */ } /* end _PRT */ } /* end PBR7 */ diff --git a/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl b/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl index ca0190ff85..a635247b96 100644 --- a/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl +++ b/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl @@ -20,7 +20,7 @@ Method(_STA, 0, NotSerialized) Method(_PRT,0, NotSerialized) { - If(PMOD) + If(PICM) { Return(APR0) /* APIC mode */ } @@ -36,7 +36,7 @@ Device(PBR4) { Name(_ADR, 0x00020001) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS4) } /* APIC mode */ + If(PICM) { Return(APS4) } /* APIC mode */ Return (PS4) /* PIC Mode */ } /* end _PRT */ } /* end PBR4 */ @@ -46,7 +46,7 @@ Device(PBR5) { Name(_ADR, 0x00020002) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS5) } /* APIC mode */ + If(PICM) { Return(APS5) } /* APIC mode */ Return (PS5) /* PIC Mode */ } /* end _PRT */ } /* end PBR5 */ @@ -56,7 +56,7 @@ Device(PBR6) { Name(_ADR, 0x00020003) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS6) } /* APIC mode */ + If(PICM) { Return(APS6) } /* APIC mode */ Return (PS6) /* PIC Mode */ } /* end _PRT */ } /* end PBR6 */ @@ -66,7 +66,7 @@ Device(PBR7) { Name(_ADR, 0x00020004) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS7) } /* APIC mode */ + If(PICM) { Return(APS7) } /* APIC mode */ Return (PS7) /* PIC Mode */ } /* end _PRT */ } /* end PBR7 */ @@ -76,7 +76,7 @@ Device(PBR8) { Name(_ADR, 0x00020005) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS8) } /* APIC mode */ + If(PICM) { Return(APS8) } /* APIC mode */ Return (PS8) /* PIC Mode */ } /* end _PRT */ } /* end PBR8 */ diff --git a/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl index 2c4c14709d..aff4d4810f 100644 --- a/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl +++ b/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl @@ -19,7 +19,7 @@ Method (_STA, 0, NotSerialized) Method (_PRT, 0, NotSerialized) { - If (PMOD) + If (PICM) { Return (APR0) } @@ -36,7 +36,7 @@ Device(PBR2) { Name(_ADR, 0x00020000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS2) } /* APIC mode */ + If(PICM) { Return(APS2) } /* APIC mode */ Return (PS2) /* PIC Mode */ } /* end _PRT */ } /* end PBR2 */ @@ -46,7 +46,7 @@ Device(PBR3) { Name(_ADR, 0x00030000) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS3) } /* APIC mode */ + If(PICM) { Return(APS3) } /* APIC mode */ Return (PS3) /* PIC Mode */ } /* end _PRT */ } /* end PBR3 */ diff --git a/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl index ca0190ff85..a635247b96 100644 --- a/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl +++ b/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl @@ -20,7 +20,7 @@ Method(_STA, 0, NotSerialized) Method(_PRT,0, NotSerialized) { - If(PMOD) + If(PICM) { Return(APR0) /* APIC mode */ } @@ -36,7 +36,7 @@ Device(PBR4) { Name(_ADR, 0x00020001) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS4) } /* APIC mode */ + If(PICM) { Return(APS4) } /* APIC mode */ Return (PS4) /* PIC Mode */ } /* end _PRT */ } /* end PBR4 */ @@ -46,7 +46,7 @@ Device(PBR5) { Name(_ADR, 0x00020002) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS5) } /* APIC mode */ + If(PICM) { Return(APS5) } /* APIC mode */ Return (PS5) /* PIC Mode */ } /* end _PRT */ } /* end PBR5 */ @@ -56,7 +56,7 @@ Device(PBR6) { Name(_ADR, 0x00020003) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS6) } /* APIC mode */ + If(PICM) { Return(APS6) } /* APIC mode */ Return (PS6) /* PIC Mode */ } /* end _PRT */ } /* end PBR6 */ @@ -66,7 +66,7 @@ Device(PBR7) { Name(_ADR, 0x00020004) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS7) } /* APIC mode */ + If(PICM) { Return(APS7) } /* APIC mode */ Return (PS7) /* PIC Mode */ } /* end _PRT */ } /* end PBR7 */ @@ -76,7 +76,7 @@ Device(PBR8) { Name(_ADR, 0x00020005) Name(_PRW, Package() {0x18, 4}) Method(_PRT,0) { - If(PMOD) { Return(APS8) } /* APIC mode */ + If(PICM) { Return(APS8) } /* APIC mode */ Return (PS8) /* PIC Mode */ } /* end _PRT */ } /* end PBR8 */ diff --git a/src/soc/amd/picasso/acpi/globalnvs.asl b/src/soc/amd/picasso/acpi/globalnvs.asl index 709649211d..1c19059425 100644 --- a/src/soc/amd/picasso/acpi/globalnvs.asl +++ b/src/soc/amd/picasso/acpi/globalnvs.asl @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* Global variables */ -Name (PMOD, Zero) /* Interrupt Mode used by OS. Assume PIC. */ +Name (PICM, Zero) /* Interrupt Mode used by OS. Assume PIC. */ /* * NOTE: The layout of the GNVS structure below must match the layout in diff --git a/src/soc/amd/picasso/acpi/pci_int.asl b/src/soc/amd/picasso/acpi/pci_int.asl index 0a6dec8906..f95dcb0659 100644 --- a/src/soc/amd/picasso/acpi/pci_int.asl +++ b/src/soc/amd/picasso/acpi/pci_int.asl @@ -3,7 +3,7 @@ Method(\_PIC, 0x01, NotSerialized) { printf("PIC MODE: %o", Arg0) - PMOD = Arg0 + PICM = Arg0 } /* PIC Possible Resource Values */ @@ -26,7 +26,7 @@ Name(_UID, UID) \ \ Method(_STA, 0) { \ - If (PMOD) { \ + If (PICM) { \ local0=APIC_REG \ } Else { \ local0=PIC_REG \ @@ -44,7 +44,7 @@ } \ \ Method(_DIS ,0) { \ - If(PMOD) { \ + If(PICM) { \ printf("PCI: \\_SB.%s._DIS APIC", #DEV_NAME) \ APIC_REG=0x1f \ } Else { \ @@ -54,7 +54,7 @@ } \ \ Method(_PRS ,0) { \ - If(PMOD) { \ + If(PICM) { \ printf("PCI: \\_SB.%s._PRS => APIC", #DEV_NAME) \ Return(IRQI) \ } Else { \ @@ -73,7 +73,7 @@ { 0 } \ } \ CreateDWordField(local0, NUMB._INT, IRQN) \ - If(PMOD) { \ + If(PICM) { \ printf("PCI: \\_SB.%s._CRS APIC: %o", #DEV_NAME, APIC_REG) \ IRQN=APIC_REG \ } Else { \ @@ -90,7 +90,7 @@ Method(_SRS, 1) { \ CreateWordField(ARG0, 0x5, IRQN) \ \ - If(PMOD) { \ + If(PICM) { \ printf("PCI: \\_SB.%s._SRS APIC: %o", #DEV_NAME, IRQN) \ APIC_REG=IRQN \ } Else { \ diff --git a/src/soc/amd/picasso/acpi/sb_fch.asl b/src/soc/amd/picasso/acpi/sb_fch.asl index 69c8b1b89a..32268da998 100644 --- a/src/soc/amd/picasso/acpi/sb_fch.asl +++ b/src/soc/amd/picasso/acpi/sb_fch.asl @@ -38,7 +38,7 @@ Device (GPIO) Memory32Fixed (ReadWrite, ACPIMMIO_GPIO0_BASE, 0x400) } CreateDWordField (Local0, IRQR._INT, IRQN) - If (PMOD) { + If (PICM) { IRQN = IGPI } Else { IRQN = PGPI @@ -73,7 +73,7 @@ Device (MMC0) Memory32Fixed (ReadWrite, APU_EMMC_BASE, 0x1000) } CreateDWordField (Local0, IRQR._INT, IRQN) - If (PMOD) { + If (PICM) { IRQN = IMMC } Else { IRQN = PMMC @@ -109,7 +109,7 @@ Device (FUR0) Memory32Fixed (ReadWrite, APU_DMAC0_BASE, 0x1000) } CreateDWordField (Local0, IRQR._INT, IRQN) - If (PMOD) { + If (PICM) { IRQN = IUA0 } Else { IRQN = PUA0 @@ -142,7 +142,7 @@ Device (FUR1) { Memory32Fixed (ReadWrite, APU_DMAC1_BASE, 0x1000) } CreateDWordField (Local0, IRQR._INT, IRQN) - If (PMOD) { + If (PICM) { IRQN = IUA1 } Else { IRQN = PUA1 @@ -175,7 +175,7 @@ Device (FUR2) { Memory32Fixed (ReadWrite, APU_DMAC2_BASE, 0x1000) } CreateDWordField (Local0, IRQR._INT, IRQN) - If (PMOD) { + If (PICM) { IRQN = IUA2 } Else { IRQN = PUA2 @@ -208,7 +208,7 @@ Device (FUR3) { Memory32Fixed (ReadWrite, APU_DMAC3_BASE, 0x1000) } CreateDWordField (Local0, IRQR._INT, IRQN) - If (PMOD) { + If (PICM) { IRQN = IUA3 } Else { IRQN = PUA3 @@ -240,7 +240,7 @@ Device (I2C2) { Memory32Fixed (ReadWrite, APU_I2C2_BASE, 0x1000) } CreateDWordField (Local0, IRQR._INT, IRQN) - If (PMOD) { + If (PICM) { IRQN = II22 } Else { IRQN = PI22 @@ -277,7 +277,7 @@ Device (I2C3) Memory32Fixed (ReadWrite, APU_I2C3_BASE, 0x1000) } CreateDWordField (Local0, IRQR._INT, IRQN) - If (PMOD) { + If (PICM) { IRQN = II23 } Else { IRQN = PI23 diff --git a/src/soc/amd/stoneyridge/acpi/northbridge.asl b/src/soc/amd/stoneyridge/acpi/northbridge.asl index 5a052e70c5..042f66a4e1 100644 --- a/src/soc/amd/stoneyridge/acpi/northbridge.asl +++ b/src/soc/amd/stoneyridge/acpi/northbridge.asl @@ -20,7 +20,7 @@ Method(_STA, 0, NotSerialized) Method(_PRT,0, NotSerialized) { - If(PMOD) + If(PICM) { Return(APR0) /* APIC mode */ } @@ -40,7 +40,7 @@ Device(IGFX) { Device(PBR4) { Name(_ADR, 0x00020001) Method(_PRT,0) { - If(PMOD){ Return(APS4) } /* APIC mode */ + If(PICM){ Return(APS4) } /* APIC mode */ Return (PS4) /* PIC Mode */ } /* end _PRT */ } /* end PBR4 */ @@ -49,7 +49,7 @@ Device(PBR4) { Device(PBR5) { Name(_ADR, 0x00020002) Method(_PRT,0) { - If(PMOD){ Return(APS5) } /* APIC mode */ + If(PICM){ Return(APS5) } /* APIC mode */ Return (PS5) /* PIC Mode */ } /* end _PRT */ } /* end PBR5 */ @@ -58,7 +58,7 @@ Device(PBR5) { Device(PBR6) { Name(_ADR, 0x00020003) Method(_PRT,0) { - If(PMOD){ Return(APS6) } /* APIC mode */ + If(PICM){ Return(APS6) } /* APIC mode */ Return (PS6) /* PIC Mode */ } /* end _PRT */ } /* end PBR6 */ @@ -67,7 +67,7 @@ Device(PBR6) { Device(PBR7) { Name(_ADR, 0x00020004) Method(_PRT,0) { - If(PMOD){ Return(APS7) } /* APIC mode */ + If(PICM){ Return(APS7) } /* APIC mode */ Return (PS7) /* PIC Mode */ } /* end _PRT */ } /* end PBR7 */ @@ -76,7 +76,7 @@ Device(PBR7) { Device(PBR8) { Name(_ADR, 0x00020005) Method(_PRT,0) { - If(PMOD){ Return(APS8) } /* APIC mode */ + If(PICM){ Return(APS8) } /* APIC mode */ Return (PS8) /* PIC Mode */ } /* end _PRT */ } /* end PBR8 */ diff --git a/src/soc/amd/stoneyridge/acpi/pci_int.asl b/src/soc/amd/stoneyridge/acpi/pci_int.asl index 0f3d882a8b..bd29ebb71f 100644 --- a/src/soc/amd/stoneyridge/acpi/pci_int.asl +++ b/src/soc/amd/stoneyridge/acpi/pci_int.asl @@ -109,7 +109,7 @@ { \_SB.CIRQ() } - Store(Arg0, PMOD) + Store(Arg0, PICM) } Method(CIRQ, 0x00, NotSerialized){ diff --git a/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl b/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl index b2898ebbc0..69727d4759 100644 --- a/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl +++ b/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl @@ -109,7 +109,7 @@ { \_SB.CIRQ() } - Store(Arg0, PMOD) + Store(Arg0, PICM) } Method(CIRQ, 0x00, NotSerialized){ diff --git a/src/southbridge/amd/cimx/sb800/acpi/fch.asl b/src/southbridge/amd/cimx/sb800/acpi/fch.asl index 0986b69070..a3a17a4f35 100644 --- a/src/southbridge/amd/cimx/sb800/acpi/fch.asl +++ b/src/southbridge/amd/cimx/sb800/acpi/fch.asl @@ -27,7 +27,7 @@ Method(_STA, 0) { } Method(_PRT,0) { - If(PMOD){ Return(APR0) } /* APIC mode */ + If(PICM){ Return(APR0) } /* APIC mode */ Return (PR0) /* PIC Mode */ } /* end _PRT */ diff --git a/src/southbridge/amd/cimx/sb800/acpi/pcie.asl b/src/southbridge/amd/cimx/sb800/acpi/pcie.asl index a2d7f12364..4420938d67 100644 --- a/src/southbridge/amd/cimx/sb800/acpi/pcie.asl +++ b/src/southbridge/amd/cimx/sb800/acpi/pcie.asl @@ -138,7 +138,7 @@ Scope(\_SB) { { \_SB.CIRQ() } - Store(Arg0, PMOD) + Store(Arg0, PICM) } Method(CIRQ, 0x00, NotSerialized){ diff --git a/src/southbridge/amd/pi/hudson/acpi/pci_int.asl b/src/southbridge/amd/pi/hudson/acpi/pci_int.asl index b2898ebbc0..69727d4759 100644 --- a/src/southbridge/amd/pi/hudson/acpi/pci_int.asl +++ b/src/southbridge/amd/pi/hudson/acpi/pci_int.asl @@ -109,7 +109,7 @@ { \_SB.CIRQ() } - Store(Arg0, PMOD) + Store(Arg0, PICM) } Method(CIRQ, 0x00, NotSerialized){ -- cgit v1.2.3