diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2022-11-21 17:27:07 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2022-11-28 10:09:04 +0000 |
| commit | 307320c23f2c1907ff6cf6fa87608d1155aba05f (patch) | |
| tree | 0db8940fa8deebb85c400c59d5425ebec2b8bf1e /src/soc/intel/common | |
| parent | e8a3af10691a4831a85d8760f7fcb20f78065f78 (diff) | |
sb,soc/intel: Address TCO SECOND_TO_STS name collision
Later soc/intel/common/smbus addresses TCO2_STS as a separate
16-bit register, while baytrail and braswell assumes 32-bit
wide TCO1_STS to extend as TCO2_STS.
In src/soc/intel/denverton_ns:
#define TCO2_STS_SECOND_TO 0x02
In soc/intel/baytrail,braswell:
#define SECOND_TO_STS (1 << 17)
Elsewehere
#define SECOND_TO_STS (1 << 1)
It's expected that we remove the first (1 << 17) case and only
access TCO2_STS as a separate 16-bit register. For now, use
unique names to avoid confusion.
Change-Id: I07cc46a9d600b2bf2f23588b26891268e9ce4de0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70044
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Diffstat (limited to 'src/soc/intel/common')
| -rw-r--r-- | src/soc/intel/common/block/smbus/tco.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/common/pch/include/intelpch/smbus.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/soc/intel/common/block/smbus/tco.c b/src/soc/intel/common/block/smbus/tco.c index 1ca88428ba..12b176c094 100644 --- a/src/soc/intel/common/block/smbus/tco.c +++ b/src/soc/intel/common/block/smbus/tco.c @@ -72,7 +72,7 @@ uint32_t tco_reset_status(void) /* TCO Status 2 register */ tco2_sts = tco_read_reg(TCO2_STS); - tco_write_reg(TCO2_STS, tco2_sts | TCO_STS_SECOND_TO); + tco_write_reg(TCO2_STS, tco2_sts | TCO2_STS_SECOND_TO); return (tco2_sts << 16) | tco1_sts; } diff --git a/src/soc/intel/common/pch/include/intelpch/smbus.h b/src/soc/intel/common/pch/include/intelpch/smbus.h index 238da2b73b..78b7953950 100644 --- a/src/soc/intel/common/pch/include/intelpch/smbus.h +++ b/src/soc/intel/common/pch/include/intelpch/smbus.h @@ -7,7 +7,7 @@ #define TCO1_STS 0x04 #define TCO_TIMEOUT (1 << 3) #define TCO2_STS 0x06 -#define TCO_STS_SECOND_TO (1 << 1) +#define TCO2_STS_SECOND_TO (1 << 1) #define TCO_INTRD_DET (1 << 0) #define TCO1_CNT 0x08 #define TCO_LOCK (1 << 12) |