sb,soc/amd: Rename PMOD to PICM in ASL

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 <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49903
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>

5 files changed, 22 insertions, 22 deletions

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){