| Message ID | 20220516062328.298336-4-pdel@fb.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw: aspeed: Init all UART's with serial devices | expand |
On 5/16/22 08:23, Peter Delevoryas wrote: > The AST1030 machine initialization was not respecting the Aspeed SoC > property "uart-default", which specifies which UART should be connected to > the first serial device, it was just always connecting UART5. This doesn't > change any behavior, because the default value for "uart-default" is UART5, > but it makes it possible to override this in new machine definitions using > the AST1030. > > Signed-off-by: Peter Delevoryas <pdel@fb.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > hw/arm/aspeed_ast10x0.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c > index bb8177e86c..faafb800f3 100644 > --- a/hw/arm/aspeed_ast10x0.c > +++ b/hw/arm/aspeed_ast10x0.c > @@ -215,9 +215,9 @@ static void aspeed_soc_ast1030_realize(DeviceState *dev_soc, Error **errp) > qdev_get_gpio_in(DEVICE(&s->armv7m), > sc->irqmap[ASPEED_DEV_KCS] + aspeed_lpc_kcs_4)); > > - /* UART5 - attach an 8250 to the IO space as our UART */ > - serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2, > - aspeed_soc_get_irq(s, ASPEED_DEV_UART5), > + /* UART - attach an 8250 to the IO space as our UART */ > + serial_mm_init(get_system_memory(), sc->memmap[s->uart_default], 2, > + aspeed_soc_get_irq(s, s->uart_default), > 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN); > > /* Timer */
diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c index bb8177e86c..faafb800f3 100644 --- a/hw/arm/aspeed_ast10x0.c +++ b/hw/arm/aspeed_ast10x0.c @@ -215,9 +215,9 @@ static void aspeed_soc_ast1030_realize(DeviceState *dev_soc, Error **errp) qdev_get_gpio_in(DEVICE(&s->armv7m), sc->irqmap[ASPEED_DEV_KCS] + aspeed_lpc_kcs_4)); - /* UART5 - attach an 8250 to the IO space as our UART */ - serial_mm_init(get_system_memory(), sc->memmap[ASPEED_DEV_UART5], 2, - aspeed_soc_get_irq(s, ASPEED_DEV_UART5), + /* UART - attach an 8250 to the IO space as our UART */ + serial_mm_init(get_system_memory(), sc->memmap[s->uart_default], 2, + aspeed_soc_get_irq(s, s->uart_default), 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN); /* Timer */
The AST1030 machine initialization was not respecting the Aspeed SoC property "uart-default", which specifies which UART should be connected to the first serial device, it was just always connecting UART5. This doesn't change any behavior, because the default value for "uart-default" is UART5, but it makes it possible to override this in new machine definitions using the AST1030. Signed-off-by: Peter Delevoryas <pdel@fb.com> --- hw/arm/aspeed_ast10x0.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)