Skip to contentSkip to conversation

hw/arm: ast2600: Fix address mapping of second SPI controller

PATCH Applied Cédric Le Goater 3 participants 3 messages Jan 26, 2022 – Jan 28, 2022 Arm/Aspeed machine support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/arm: ast2600: Fix address mapping of second SPI controller

Address should be 0x1E631000 and not 0x1E641000 as initially introduced.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/838

Fixes f25c0ae1079d ("aspeed/soc: Add AST2600 support")
---
 hw/arm/aspeed_ast2600.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/arm/aspeed_ast2600.c +1 -1
index c3783bd87a25..568205fa6e9d 100644
@@ -29,7 +29,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = {
     [ASPEED_DEV_PWM]       = 0x1E610000,
     [ASPEED_DEV_FMC]       = 0x1E620000,
     [ASPEED_DEV_SPI1]      = 0x1E630000,
-    [ASPEED_DEV_SPI2]      = 0x1E641000,
+    [ASPEED_DEV_SPI2]      = 0x1E631000,
     [ASPEED_DEV_EHCI1]     = 0x1E6A1000,
     [ASPEED_DEV_EHCI2]     = 0x1E6A3000,
     [ASPEED_DEV_MII1]      = 0x1E650000,
Signature · 1 line
2.31.1
Reviewed-by Philippe Mathieu-Daudé on v1 1/1
#1 lore raw
Quoted 15 lines · Cédric Le Goater

Address should be 0x1E631000 and not 0x1E641000 as initially introduced.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/838

Fixes f25c0ae1079d ("aspeed/soc: Add AST2600 support")
---
 hw/arm/aspeed_ast2600.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/arm/aspeed_ast2600.c +0 -0
index c3783bd87a25..568205fa6e9d 100644

hw/arm/aspeed_ast2600.c static const hwaddr aspeed_soc_ast2600_memmap[] = { · line 35

Quoted 8 lines
hw/arm/aspeed_ast2600.c +1 -1
@@ -29,7 +29,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = {
     [ASPEED_DEV_PWM]       = 0x1E610000,
     [ASPEED_DEV_FMC]       = 0x1E620000,
     [ASPEED_DEV_SPI1]      = 0x1E630000,
-    [ASPEED_DEV_SPI2]      = 0x1E641000,
+    [ASPEED_DEV_SPI2]      = 0x1E631000,
     [ASPEED_DEV_EHCI1]     = 0x1E6A1000,
     [ASPEED_DEV_EHCI2]     = 0x1E6A3000,
     [ASPEED_DEV_MII1]      = 0x1E650000,
#2 lore raw
In reply to Cédric Le Goater
Quoted 10 lines · Cédric Le Goater

Address should be 0x1E631000 and not 0x1E641000 as initially introduced.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/838

Fixes f25c0ae1079d ("aspeed/soc: Add AST2600 support")
---
 hw/arm/aspeed_ast2600.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to target-arm.next, thanks.

-- PMM