Skip to content

Commit ecc1a4e

Browse files
jamin-aspeedlegoater
authored andcommitted
hw/arm/aspeed_ast27x0: Sort the memmap table by mapping address
To improve readability, sort the memmap table by mapping address Signed-off-by: Jamin Lin <[email protected]> Reviewed-by: Cédric Le Goater <[email protected]> Link: https://lore.kernel.org/qemu-devel/[email protected] Signed-off-by: Cédric Le Goater <[email protected]>
1 parent 498c519 commit ecc1a4e

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

hw/arm/aspeed_ast27x0.c

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,40 @@
2424
#include "qemu/log.h"
2525

2626
static const hwaddr aspeed_soc_ast2700_memmap[] = {
27-
[ASPEED_DEV_SPI_BOOT] = 0x100000000,
2827
[ASPEED_DEV_SRAM] = 0x10000000,
28+
[ASPEED_DEV_HACE] = 0x12070000,
29+
[ASPEED_DEV_EMMC] = 0x12090000,
30+
[ASPEED_DEV_INTC] = 0x12100000,
31+
[ASPEED_GIC_DIST] = 0x12200000,
32+
[ASPEED_GIC_REDIST] = 0x12280000,
2933
[ASPEED_DEV_SDMC] = 0x12C00000,
3034
[ASPEED_DEV_SCU] = 0x12C02000,
35+
[ASPEED_DEV_RTC] = 0x12C0F000,
36+
[ASPEED_DEV_TIMER1] = 0x12C10000,
37+
[ASPEED_DEV_SLI] = 0x12C17000,
38+
[ASPEED_DEV_UART4] = 0X12C1A000,
39+
[ASPEED_DEV_FMC] = 0x14000000,
40+
[ASPEED_DEV_SPI0] = 0x14010000,
41+
[ASPEED_DEV_SPI1] = 0x14020000,
42+
[ASPEED_DEV_SPI2] = 0x14030000,
43+
[ASPEED_DEV_MII1] = 0x14040000,
44+
[ASPEED_DEV_MII2] = 0x14040008,
45+
[ASPEED_DEV_MII3] = 0x14040010,
46+
[ASPEED_DEV_ETH1] = 0x14050000,
47+
[ASPEED_DEV_ETH2] = 0x14060000,
48+
[ASPEED_DEV_ETH3] = 0x14070000,
49+
[ASPEED_DEV_SDHCI] = 0x14080000,
50+
[ASPEED_DEV_ADC] = 0x14C00000,
3151
[ASPEED_DEV_SCUIO] = 0x14C02000,
52+
[ASPEED_DEV_GPIO] = 0x14C0B000,
53+
[ASPEED_DEV_I2C] = 0x14C0F000,
54+
[ASPEED_DEV_INTCIO] = 0x14C18000,
55+
[ASPEED_DEV_SLIIO] = 0x14C1E000,
56+
[ASPEED_DEV_VUART] = 0X14C30000,
3257
[ASPEED_DEV_UART0] = 0X14C33000,
3358
[ASPEED_DEV_UART1] = 0X14C33100,
3459
[ASPEED_DEV_UART2] = 0X14C33200,
3560
[ASPEED_DEV_UART3] = 0X14C33300,
36-
[ASPEED_DEV_UART4] = 0X12C1A000,
3761
[ASPEED_DEV_UART5] = 0X14C33400,
3862
[ASPEED_DEV_UART6] = 0X14C33500,
3963
[ASPEED_DEV_UART7] = 0X14C33600,
@@ -43,32 +67,8 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = {
4367
[ASPEED_DEV_UART11] = 0X14C33A00,
4468
[ASPEED_DEV_UART12] = 0X14C33B00,
4569
[ASPEED_DEV_WDT] = 0x14C37000,
46-
[ASPEED_DEV_VUART] = 0X14C30000,
47-
[ASPEED_DEV_FMC] = 0x14000000,
48-
[ASPEED_DEV_SPI0] = 0x14010000,
49-
[ASPEED_DEV_SPI1] = 0x14020000,
50-
[ASPEED_DEV_SPI2] = 0x14030000,
70+
[ASPEED_DEV_SPI_BOOT] = 0x100000000,
5171
[ASPEED_DEV_SDRAM] = 0x400000000,
52-
[ASPEED_DEV_MII1] = 0x14040000,
53-
[ASPEED_DEV_MII2] = 0x14040008,
54-
[ASPEED_DEV_MII3] = 0x14040010,
55-
[ASPEED_DEV_ETH1] = 0x14050000,
56-
[ASPEED_DEV_ETH2] = 0x14060000,
57-
[ASPEED_DEV_ETH3] = 0x14070000,
58-
[ASPEED_DEV_EMMC] = 0x12090000,
59-
[ASPEED_DEV_INTC] = 0x12100000,
60-
[ASPEED_DEV_INTCIO] = 0x14C18000,
61-
[ASPEED_DEV_SLI] = 0x12C17000,
62-
[ASPEED_DEV_SLIIO] = 0x14C1E000,
63-
[ASPEED_GIC_DIST] = 0x12200000,
64-
[ASPEED_GIC_REDIST] = 0x12280000,
65-
[ASPEED_DEV_ADC] = 0x14C00000,
66-
[ASPEED_DEV_I2C] = 0x14C0F000,
67-
[ASPEED_DEV_GPIO] = 0x14C0B000,
68-
[ASPEED_DEV_RTC] = 0x12C0F000,
69-
[ASPEED_DEV_SDHCI] = 0x14080000,
70-
[ASPEED_DEV_TIMER1] = 0x12C10000,
71-
[ASPEED_DEV_HACE] = 0x12070000,
7272
};
7373

7474
#define AST2700_MAX_IRQ 256

0 commit comments

Comments
 (0)