| Message ID | 20250306103846.429221-25-jamin_lin@aspeedtech.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Support AST2700 A1 | expand |
On 3/6/25 11:38, Jamin Lin wrote: > To improve readability, sort the memmap table by mapping address > > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > --- > hw/arm/aspeed_ast27x0.c | 54 ++++++++++++++++++++--------------------- > 1 file changed, 27 insertions(+), 27 deletions(-) > > diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c > index 7439512b83..3330484bf5 100644 > --- a/hw/arm/aspeed_ast27x0.c > +++ b/hw/arm/aspeed_ast27x0.c > @@ -24,16 +24,40 @@ > #include "qemu/log.h" > > static const hwaddr aspeed_soc_ast2700_memmap[] = { > - [ASPEED_DEV_SPI_BOOT] = 0x100000000, > [ASPEED_DEV_SRAM] = 0x10000000, > + [ASPEED_DEV_HACE] = 0x12070000, > + [ASPEED_DEV_EMMC] = 0x12090000, > + [ASPEED_DEV_INTC] = 0x12100000, > + [ASPEED_GIC_DIST] = 0x12200000, > + [ASPEED_GIC_REDIST] = 0x12280000, > [ASPEED_DEV_SDMC] = 0x12C00000, > [ASPEED_DEV_SCU] = 0x12C02000, > + [ASPEED_DEV_RTC] = 0x12C0F000, > + [ASPEED_DEV_TIMER1] = 0x12C10000, > + [ASPEED_DEV_SLI] = 0x12C17000, > + [ASPEED_DEV_UART4] = 0X12C1A000, > + [ASPEED_DEV_FMC] = 0x14000000, > + [ASPEED_DEV_SPI0] = 0x14010000, > + [ASPEED_DEV_SPI1] = 0x14020000, > + [ASPEED_DEV_SPI2] = 0x14030000, > + [ASPEED_DEV_MII1] = 0x14040000, > + [ASPEED_DEV_MII2] = 0x14040008, > + [ASPEED_DEV_MII3] = 0x14040010, > + [ASPEED_DEV_ETH1] = 0x14050000, > + [ASPEED_DEV_ETH2] = 0x14060000, > + [ASPEED_DEV_ETH3] = 0x14070000, > + [ASPEED_DEV_SDHCI] = 0x14080000, > + [ASPEED_DEV_ADC] = 0x14C00000, > [ASPEED_DEV_SCUIO] = 0x14C02000, > + [ASPEED_DEV_GPIO] = 0x14C0B000, > + [ASPEED_DEV_I2C] = 0x14C0F000, > + [ASPEED_DEV_INTCIO] = 0x14C18000, > + [ASPEED_DEV_SLIIO] = 0x14C1E000, > + [ASPEED_DEV_VUART] = 0X14C30000, > [ASPEED_DEV_UART0] = 0X14C33000, > [ASPEED_DEV_UART1] = 0X14C33100, > [ASPEED_DEV_UART2] = 0X14C33200, > [ASPEED_DEV_UART3] = 0X14C33300, > - [ASPEED_DEV_UART4] = 0X12C1A000, > [ASPEED_DEV_UART5] = 0X14C33400, > [ASPEED_DEV_UART6] = 0X14C33500, > [ASPEED_DEV_UART7] = 0X14C33600, > @@ -43,32 +67,8 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = { > [ASPEED_DEV_UART11] = 0X14C33A00, > [ASPEED_DEV_UART12] = 0X14C33B00, > [ASPEED_DEV_WDT] = 0x14C37000, > - [ASPEED_DEV_VUART] = 0X14C30000, > - [ASPEED_DEV_FMC] = 0x14000000, > - [ASPEED_DEV_SPI0] = 0x14010000, > - [ASPEED_DEV_SPI1] = 0x14020000, > - [ASPEED_DEV_SPI2] = 0x14030000, > + [ASPEED_DEV_SPI_BOOT] = 0x100000000, > [ASPEED_DEV_SDRAM] = 0x400000000, > - [ASPEED_DEV_MII1] = 0x14040000, > - [ASPEED_DEV_MII2] = 0x14040008, > - [ASPEED_DEV_MII3] = 0x14040010, > - [ASPEED_DEV_ETH1] = 0x14050000, > - [ASPEED_DEV_ETH2] = 0x14060000, > - [ASPEED_DEV_ETH3] = 0x14070000, > - [ASPEED_DEV_EMMC] = 0x12090000, > - [ASPEED_DEV_INTC] = 0x12100000, > - [ASPEED_DEV_INTCIO] = 0x14C18000, > - [ASPEED_DEV_SLI] = 0x12C17000, > - [ASPEED_DEV_SLIIO] = 0x14C1E000, > - [ASPEED_GIC_DIST] = 0x12200000, > - [ASPEED_GIC_REDIST] = 0x12280000, > - [ASPEED_DEV_ADC] = 0x14C00000, > - [ASPEED_DEV_I2C] = 0x14C0F000, > - [ASPEED_DEV_GPIO] = 0x14C0B000, > - [ASPEED_DEV_RTC] = 0x12C0F000, > - [ASPEED_DEV_SDHCI] = 0x14080000, > - [ASPEED_DEV_TIMER1] = 0x12C10000, > - [ASPEED_DEV_HACE] = 0x12070000, > }; > > #define AST2700_MAX_IRQ 256
diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index 7439512b83..3330484bf5 100644 --- a/hw/arm/aspeed_ast27x0.c +++ b/hw/arm/aspeed_ast27x0.c @@ -24,16 +24,40 @@ #include "qemu/log.h" static const hwaddr aspeed_soc_ast2700_memmap[] = { - [ASPEED_DEV_SPI_BOOT] = 0x100000000, [ASPEED_DEV_SRAM] = 0x10000000, + [ASPEED_DEV_HACE] = 0x12070000, + [ASPEED_DEV_EMMC] = 0x12090000, + [ASPEED_DEV_INTC] = 0x12100000, + [ASPEED_GIC_DIST] = 0x12200000, + [ASPEED_GIC_REDIST] = 0x12280000, [ASPEED_DEV_SDMC] = 0x12C00000, [ASPEED_DEV_SCU] = 0x12C02000, + [ASPEED_DEV_RTC] = 0x12C0F000, + [ASPEED_DEV_TIMER1] = 0x12C10000, + [ASPEED_DEV_SLI] = 0x12C17000, + [ASPEED_DEV_UART4] = 0X12C1A000, + [ASPEED_DEV_FMC] = 0x14000000, + [ASPEED_DEV_SPI0] = 0x14010000, + [ASPEED_DEV_SPI1] = 0x14020000, + [ASPEED_DEV_SPI2] = 0x14030000, + [ASPEED_DEV_MII1] = 0x14040000, + [ASPEED_DEV_MII2] = 0x14040008, + [ASPEED_DEV_MII3] = 0x14040010, + [ASPEED_DEV_ETH1] = 0x14050000, + [ASPEED_DEV_ETH2] = 0x14060000, + [ASPEED_DEV_ETH3] = 0x14070000, + [ASPEED_DEV_SDHCI] = 0x14080000, + [ASPEED_DEV_ADC] = 0x14C00000, [ASPEED_DEV_SCUIO] = 0x14C02000, + [ASPEED_DEV_GPIO] = 0x14C0B000, + [ASPEED_DEV_I2C] = 0x14C0F000, + [ASPEED_DEV_INTCIO] = 0x14C18000, + [ASPEED_DEV_SLIIO] = 0x14C1E000, + [ASPEED_DEV_VUART] = 0X14C30000, [ASPEED_DEV_UART0] = 0X14C33000, [ASPEED_DEV_UART1] = 0X14C33100, [ASPEED_DEV_UART2] = 0X14C33200, [ASPEED_DEV_UART3] = 0X14C33300, - [ASPEED_DEV_UART4] = 0X12C1A000, [ASPEED_DEV_UART5] = 0X14C33400, [ASPEED_DEV_UART6] = 0X14C33500, [ASPEED_DEV_UART7] = 0X14C33600, @@ -43,32 +67,8 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = { [ASPEED_DEV_UART11] = 0X14C33A00, [ASPEED_DEV_UART12] = 0X14C33B00, [ASPEED_DEV_WDT] = 0x14C37000, - [ASPEED_DEV_VUART] = 0X14C30000, - [ASPEED_DEV_FMC] = 0x14000000, - [ASPEED_DEV_SPI0] = 0x14010000, - [ASPEED_DEV_SPI1] = 0x14020000, - [ASPEED_DEV_SPI2] = 0x14030000, + [ASPEED_DEV_SPI_BOOT] = 0x100000000, [ASPEED_DEV_SDRAM] = 0x400000000, - [ASPEED_DEV_MII1] = 0x14040000, - [ASPEED_DEV_MII2] = 0x14040008, - [ASPEED_DEV_MII3] = 0x14040010, - [ASPEED_DEV_ETH1] = 0x14050000, - [ASPEED_DEV_ETH2] = 0x14060000, - [ASPEED_DEV_ETH3] = 0x14070000, - [ASPEED_DEV_EMMC] = 0x12090000, - [ASPEED_DEV_INTC] = 0x12100000, - [ASPEED_DEV_INTCIO] = 0x14C18000, - [ASPEED_DEV_SLI] = 0x12C17000, - [ASPEED_DEV_SLIIO] = 0x14C1E000, - [ASPEED_GIC_DIST] = 0x12200000, - [ASPEED_GIC_REDIST] = 0x12280000, - [ASPEED_DEV_ADC] = 0x14C00000, - [ASPEED_DEV_I2C] = 0x14C0F000, - [ASPEED_DEV_GPIO] = 0x14C0B000, - [ASPEED_DEV_RTC] = 0x12C0F000, - [ASPEED_DEV_SDHCI] = 0x14080000, - [ASPEED_DEV_TIMER1] = 0x12C10000, - [ASPEED_DEV_HACE] = 0x12070000, }; #define AST2700_MAX_IRQ 256
To improve readability, sort the memmap table by mapping address Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> --- hw/arm/aspeed_ast27x0.c | 54 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-)