Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58336 )
Change subject: soc/amd/stoneyridge/include/iomap: drop I2C_BUS_ADDRESS(x) macro ......................................................................
soc/amd/stoneyridge/include/iomap: drop I2C_BUS_ADDRESS(x) macro
The I2C_BUS_ADDRESS(x) macro isn't used to iterate over the I2C controller base addresses, so drop this and use the fixed MMIO address for the I2C[ABCD]_BASE_ADDRESS defines instead which also allows using those defines in the ACPI code.
TEST=Timeless build results in identical image for Google/Treeya.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: Idd7484a0322dc5167cbb7fdcd9a2583f0dbed50e --- M src/soc/amd/stoneyridge/include/soc/iomap.h 1 file changed, 4 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/58336/1
diff --git a/src/soc/amd/stoneyridge/include/soc/iomap.h b/src/soc/amd/stoneyridge/include/soc/iomap.h index c8cee23..3d01938 100644 --- a/src/soc/amd/stoneyridge/include/soc/iomap.h +++ b/src/soc/amd/stoneyridge/include/soc/iomap.h @@ -11,13 +11,10 @@ #define ALINK_AHB_ADDRESS 0xfedc0000
/* I2C fixed address */ -#define I2C_BASE_ADDRESS 0xfedc2000 -#define I2C_DEVICE_SIZE 0x00001000 -#define I2C_BUS_ADDRESS(x) (I2C_BASE_ADDRESS + I2C_DEVICE_SIZE * (x)) -#define I2CA_BASE_ADDRESS (I2C_BUS_ADDRESS(0)) -#define I2CB_BASE_ADDRESS (I2C_BUS_ADDRESS(1)) -#define I2CC_BASE_ADDRESS (I2C_BUS_ADDRESS(2)) -#define I2CD_BASE_ADDRESS (I2C_BUS_ADDRESS(3)) +#define I2CA_BASE_ADDRESS 0xfedc2000 +#define I2CB_BASE_ADDRESS 0xfedc3000 +#define I2CC_BASE_ADDRESS 0xfedc4000 +#define I2CD_BASE_ADDRESS 0xfedc5000
#if CONFIG(HPET_ADDRESS_OVERRIDE) #error HPET address override is not allowed and must be fixed at 0xfed00000