Commit a9a70ac692 for qemu.org
commit a9a70ac6925e6a3b3e1b19e83ae863da5bfc0ffe
Author: Jamin Lin <jamin_lin@aspeedtech.com>
Date: Tue Feb 3 10:08:48 2026 +0800
hw/arm/aspeed_ast27x0: Sort SSP and TSP IRQ maps
Sort the SSP and TSP IRQ map tables to improve readability and make the
definitions easier to maintain.
No functional change.
Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20260203020855.1642884-4-jamin_lin@aspeedtech.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
diff --git a/hw/arm/aspeed_ast27x0-ssp.c b/hw/arm/aspeed_ast27x0-ssp.c
index e4bcf0fa2a..9b12ba6743 100644
--- a/hw/arm/aspeed_ast27x0-ssp.c
+++ b/hw/arm/aspeed_ast27x0-ssp.c
@@ -44,12 +44,13 @@ static const hwaddr aspeed_soc_ast27x0ssp_memmap[] = {
};
static const int aspeed_soc_ast27x0ssp_irqmap[] = {
+ [ASPEED_DEV_UART4] = 8,
[ASPEED_DEV_SCU] = 12,
+ [ASPEED_DEV_TIMER1] = 16,
[ASPEED_DEV_UART0] = 164,
[ASPEED_DEV_UART1] = 164,
[ASPEED_DEV_UART2] = 164,
[ASPEED_DEV_UART3] = 164,
- [ASPEED_DEV_UART4] = 8,
[ASPEED_DEV_UART5] = 164,
[ASPEED_DEV_UART6] = 164,
[ASPEED_DEV_UART7] = 164,
@@ -58,7 +59,6 @@ static const int aspeed_soc_ast27x0ssp_irqmap[] = {
[ASPEED_DEV_UART10] = 164,
[ASPEED_DEV_UART11] = 164,
[ASPEED_DEV_UART12] = 164,
- [ASPEED_DEV_TIMER1] = 16,
};
/* SSPINT 164 */
diff --git a/hw/arm/aspeed_ast27x0-tsp.c b/hw/arm/aspeed_ast27x0-tsp.c
index 68683a15d8..e39d1dc171 100644
--- a/hw/arm/aspeed_ast27x0-tsp.c
+++ b/hw/arm/aspeed_ast27x0-tsp.c
@@ -44,12 +44,13 @@ static const hwaddr aspeed_soc_ast27x0tsp_memmap[] = {
};
static const int aspeed_soc_ast27x0tsp_irqmap[] = {
+ [ASPEED_DEV_UART4] = 8,
[ASPEED_DEV_SCU] = 12,
+ [ASPEED_DEV_TIMER1] = 16,
[ASPEED_DEV_UART0] = 164,
[ASPEED_DEV_UART1] = 164,
[ASPEED_DEV_UART2] = 164,
[ASPEED_DEV_UART3] = 164,
- [ASPEED_DEV_UART4] = 8,
[ASPEED_DEV_UART5] = 164,
[ASPEED_DEV_UART6] = 164,
[ASPEED_DEV_UART7] = 164,
@@ -58,7 +59,6 @@ static const int aspeed_soc_ast27x0tsp_irqmap[] = {
[ASPEED_DEV_UART10] = 164,
[ASPEED_DEV_UART11] = 164,
[ASPEED_DEV_UART12] = 164,
- [ASPEED_DEV_TIMER1] = 16,
};
/* TSPINT 164 */