SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw: aspeed: Add uarts_num SoC attribute

Browse Source 
AST2400 and AST2500 have 5 UART's, while the AST2600 and AST1030 have 13.

Signed-off-by: Peter Delevoryas <pdel@fb.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20220516062328.298336-3-pdel@fb.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Peter Delevoryas 2022-05-25 10:31:33 +02:00 committed by Cédric Le Goater
parent ab5e86053d
commit c5e1bdb9e2
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/arm/aspeed_ast10x0.c
View File

@ -301,6 +301,7 @@ static void aspeed_soc_ast1030_class_init(ObjectClass *klass, void *data)
sc->ehcis_num = 0; sc->ehcis_num = 0;
sc->wdts_num = 4; sc->wdts_num = 4;
sc->macs_num = 1; sc->macs_num = 1;
sc->uarts_num = 13;
sc->irqmap = aspeed_soc_ast1030_irqmap; sc->irqmap = aspeed_soc_ast1030_irqmap;
sc->memmap = aspeed_soc_ast1030_memmap; sc->memmap = aspeed_soc_ast1030_memmap;
sc->num_cpus = 1; sc->num_cpus = 1;

1
hw/arm/aspeed_ast2600.c
View File

@ -588,6 +588,7 @@ static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data)
sc->ehcis_num = 2; sc->ehcis_num = 2;
sc->wdts_num = 4; sc->wdts_num = 4;
sc->macs_num = 4; sc->macs_num = 4;
sc->uarts_num = 13;
sc->irqmap = aspeed_soc_ast2600_irqmap; sc->irqmap = aspeed_soc_ast2600_irqmap;
sc->memmap = aspeed_soc_ast2600_memmap; sc->memmap = aspeed_soc_ast2600_memmap;
sc->num_cpus = 2; sc->num_cpus = 2;

2
hw/arm/aspeed_soc.c
View File

@ -490,6 +490,7 @@ static void aspeed_soc_ast2400_class_init(ObjectClass *oc, void *data)
sc->ehcis_num = 1; sc->ehcis_num = 1;
sc->wdts_num = 2; sc->wdts_num = 2;
sc->macs_num = 2; sc->macs_num = 2;
sc->uarts_num = 5;
sc->irqmap = aspeed_soc_ast2400_irqmap; sc->irqmap = aspeed_soc_ast2400_irqmap;
sc->memmap = aspeed_soc_ast2400_memmap; sc->memmap = aspeed_soc_ast2400_memmap;
sc->num_cpus = 1; sc->num_cpus = 1;
@ -516,6 +517,7 @@ static void aspeed_soc_ast2500_class_init(ObjectClass *oc, void *data)
sc->ehcis_num = 2; sc->ehcis_num = 2;
sc->wdts_num = 3; sc->wdts_num = 3;
sc->macs_num = 2; sc->macs_num = 2;
sc->uarts_num = 5;
sc->irqmap = aspeed_soc_ast2500_irqmap; sc->irqmap = aspeed_soc_ast2500_irqmap;
sc->memmap = aspeed_soc_ast2500_memmap; sc->memmap = aspeed_soc_ast2500_memmap;
sc->num_cpus = 1; sc->num_cpus = 1;

1
include/hw/arm/aspeed_soc.h
View File

@ -91,6 +91,7 @@ struct AspeedSoCClass {
int ehcis_num; int ehcis_num;
int wdts_num; int wdts_num;
int macs_num; int macs_num;
int uarts_num;
const int *irqmap; const int *irqmap;
const hwaddr *memmap; const hwaddr *memmap;
uint32_t num_cpus; uint32_t num_cpus;