From c1042ba2c5dc19194a75a87f1e717f411582dc9a Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 25 Mar 2021 00:50:34 +0100 Subject: [PATCH] soc/amd: move PM_RST_CTRL1 register definition to common acpimmio header TEST=Verified that this register and the defined bits exist in Cezanne, Picasso, Stoneyridge, Bolton and SB800. Signed-off-by: Felix Held Change-Id: I32d1d577b05edab006981516a5aefd822e7b984a Reviewed-on: https://review.coreboot.org/c/coreboot/+/51783 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/soc/amd/cezanne/include/soc/southbridge.h | 3 --- src/soc/amd/common/block/include/amdblocks/acpimmio.h | 3 +++ src/soc/amd/picasso/include/soc/southbridge.h | 2 -- src/soc/amd/stoneyridge/include/soc/southbridge.h | 2 -- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/soc/amd/cezanne/include/soc/southbridge.h b/src/soc/amd/cezanne/include/soc/southbridge.h index de96355942..157ad4ec3c 100644 --- a/src/soc/amd/cezanne/include/soc/southbridge.h +++ b/src/soc/amd/cezanne/include/soc/southbridge.h @@ -52,9 +52,6 @@ #define PM_ACPI_WAKE_AS_GEVENT BIT(27) #define PM_ACPI_NB_PME_GEVENT BIT(28) #define PM_ACPI_RTC_WAKE_EN BIT(29) -#define PM_RST_CTRL1 0xbe -#define SLPTYPE_CONTROL_EN BIT(5) -#define KBRSTEN BIT(4) #define PM_LPC_GATING 0xec #define PM_LPC_AB_NO_BYPASS_EN BIT(2) #define PM_LPC_A20_EN BIT(1) diff --git a/src/soc/amd/common/block/include/amdblocks/acpimmio.h b/src/soc/amd/common/block/include/amdblocks/acpimmio.h index 7891bfddb1..2e1da882c0 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpimmio.h +++ b/src/soc/amd/common/block/include/amdblocks/acpimmio.h @@ -26,6 +26,9 @@ #define LEGACY_DMA_IO_EN (1 << 2) #define CF9_IO_EN (1 << 1) #define LEGACY_IO_EN (1 << 0) +#define PM_RST_CTRL1 0xbe +#define SLPTYPE_CONTROL_EN (1 << 5) +#define KBRSTEN (1 << 4) #define PM_RST_STATUS 0xc0 /* diff --git a/src/soc/amd/picasso/include/soc/southbridge.h b/src/soc/amd/picasso/include/soc/southbridge.h index 49e4948495..ede210852c 100644 --- a/src/soc/amd/picasso/include/soc/southbridge.h +++ b/src/soc/amd/picasso/include/soc/southbridge.h @@ -68,8 +68,6 @@ #define PM_ACPI_WAKE_AS_GEVENT BIT(27) #define PM_ACPI_NB_PME_GEVENT BIT(28) #define PM_ACPI_RTC_WAKE_EN BIT(29) -#define PM_RST_CTRL1 0xbe -#define SLPTYPE_CONTROL_EN BIT(5) #define PM_LPC_GATING 0xec #define PM_LPC_AB_NO_BYPASS_EN BIT(2) #define PM_LPC_A20_EN BIT(1) diff --git a/src/soc/amd/stoneyridge/include/soc/southbridge.h b/src/soc/amd/stoneyridge/include/soc/southbridge.h index 8aa881bb34..74f2937c1c 100644 --- a/src/soc/amd/stoneyridge/include/soc/southbridge.h +++ b/src/soc/amd/stoneyridge/include/soc/southbridge.h @@ -70,8 +70,6 @@ #define PM_ACPI_WAKE_AS_GEVENT BIT(27) #define PM_ACPI_NB_PME_GEVENT BIT(28) #define PM_ACPI_RTC_WAKE_EN BIT(29) -#define PM_RST_CTRL1 0xbe -#define SLPTYPE_CONTROL_EN BIT(5) #define PM_PCIB_CFG 0xea #define PM_GENINT_DISABLE BIT(0) #define PM_LPC_GATING 0xec